Changing the structure of the CLI test.