Make test suite pass