Fix tests (error from previous merge)