Also update the tests and command-parser.
Allow for programmatically buildings sexps, rather that using raw strings.