Changed Model for Users, some changes for tests