Fix failing tests caused by previous commit