Make the build pass
Merge pull request #1 from bausmeier/fix-tests

Make the build pass