Make unit test pass