fixing the tests that started failing after the last checkin