Added some more functions and tests to get past the login