1.7 testing fixes. Fixes #53.