S3search removal modification for tests
Merge pull request #728 from arnavsharma93/master

S3search removal modification for tests