Add signup test
Clean up some forms and layouts, pass test. TODO add more comprehensive tests.
Merge branch 'master' into signup
Merge branch 'master' into signup
Add more comprehensive tests
Fix tests
Pass tests