Fix tests

Want to move to routes registration instead, but at this point all tests pass.