Pass test
Merge branch 'master' into signup
Add more comprehensive tests
Fix tests
Pass tests