Make unit test work