Multiple -sg and -sn Commandline Parameters - Step 6

Sixth pull request to implement issue #401.

Partially Implement TestRegistry changes.