Made the tests work again.