clean up unit test selection

Uses regular expressions rather than exact string matching to allow substrings and case insensitive matches.

The diff seems to include parts of my previous pull request.  I'm not sure if I messed up the basing or something else went wrong.