Fixing broken tests from new method for displaying username, tweak query numbers.