Make all the test cases work again