Improved cmd line test.