Fix tests
Merge branch 'master' of github.com:Mark-Seaman/JackHammer