Added UserModel tests and fixed some model bugs
Modification