fix unit tests from checkin de07801