Fix broken tests, delete debugging print statements
Merge branch 'master' of https://github.com/Tambling/whetstone into testing