Make unit-test work (again)