Updated tests and fixed username bug.