Speed up tests, see if we can get 0.8 tests to work