Add remaining changes

Behavior is as before; e.g. if both a single group name and
a single test name is given, both must match.
Merge pull request #407 from arstrube/filters-6

Multiple -sg and -sn Commandline Parameters - Step 6
First shot