Corrections in UT build script for Sonar