Cleaned up tests
Merge branch 'master' of github.com:Ongion/betrayal