clean up CLIWrapper spec a bit