I appear to have broken a bunch of unit tests with my last commit, they
appear to be working now.