Issue #12: checkpoint for re-structure of command-line tests + new unit test for this issue