And update the tests.