Fixing a few simple problems in the tests

This pull request depends on #7