Improve CLI-testing.