Hotswap test improvement, still failing. Needs thought.
added a simple delegate to prevent commands with spaces to be listed