Finally, finally fixing the expected results for command line tests.