fixing test cases and changing the property names