Get test suite running again

In @tkonolige and I's experiments we wanted a fully running test and benchmark suite, so we made the necessary changes on our end to get things running. @ekmett code review would be appreciated.