S3search removal modification for tests

All tests were failing