make the tests pass with daniel shaver