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