tests fixed, properties refactored