fix remaining tests
Merge branch 'master' of https://github.com/Lab41/Hemlock