Change username to email
Fixes tests errors. All tests pass
Merge branch 'get-tests-working'