Added some User properties and tests