Fix things up to get the tests to work again