Fixed the tests for the change in "invalid username" error text
Moved a few forms from threads into base