Fix failing unit test again