Fix broken tests from previous merge