Extra tests and added the property manager