tests: Added for normal modes
tests: Added for normal modes

Test methods and supporting variables for tests for
  normal modes block.

Also some minor comment cleanup and variable renaming for
  consistency / reduced confusion.

bskinn/opan,bskinn/opan