Tested property manager refactoring