Changed the test case for username, and changed the test to work with the new singleton
Merge branch 'master' of https://github.com/CMPUT301F14T05/CorgFu