Issue #20: ensure command-line unit tests pass