Multiple -sg and -sn Commandline Parameters - Step 5

Fifth pull request to implement issue #401.

Partially Implement TestRegistry changes.

Somehow, progressively more changes occur towards the end... :-(