Playing catch up with the tests.