Implemented the StandardUserModelTest and made small changes to the other Model files