check for multiple strings in the test
remove commented out code
Merge pull request #7004 from UtahDave/update_tests

Update tests