Property in type; Refactoring test suite