Fix failing tests due to changes