Better tests
Merge branch 'master' of github.com:somu/christ