Refactor into routes, remove use of globals in non-tests
Clean up model tests
Merge pull request #5 from sosickstudios/fix-tests

Fix tests