Make tests run
Merge pull request #29 from hafriedlander/fix/tests

Make tests run