Reworking User Class, Login, and updating User Unit Test