ticket:1 Updated unit-test settings according to South integration