Fix tests from b1b1ceb checkin