Modified output and test command line