Fix failing tests from last PR