ticket:1 Updated unit-test settings according to South integration -- 4 rebuild
ticket:1 Merging to master after unit-test setting updated according to south integration -- 4rebuild