fixup tests so they run, closes #34

This is the same as #35, but cherry-picks into hydro-devel so that tests run.