Fix failing tests

The tests were failing due to pull requests #15 and #16, which passed tests
individually but lead to failure after both were merged.