[fix test] Make all the tests pass.

Fixes test failures in #39