First pass on new test harness for command-line tool