Make the test suite pass