Tests now run again.
Merge pull request #57 from wbyoung/grant-fix-tests

Tests now run again.