Slight syntax change in the test-input file.
Slight control-structure change, checked in just to capture my thoughts.