clean-up tests
Merge branch 'master' of github.com:gthorsen/starter_app