Make sure tests are runable in full
Merge branch 'master' of github.com:edruid/SnakeDruid