BugId-97678: ScavengerHunt unit tests performance improved