Fixed a few bugs and removed the long username test case because it will fail because it runs before the username fix is applied. Will look into it later