Corrected the tests to make them work again.