Update and refactor tests

* Refactor tests for properties
* Create User tests