Finally trying to fix the expected results for command line tests.