Add tests
Merge branch 'master' of github.com:steelydylan/Callisto