Improve order of test strings
Throw an error if unable to find match

Throw an error if unable to find a valid string that matches the
regular expression for some variable.
Add a FIXME
Run commands with optional parameters being given first

... before attempting to run them without setting the optional
parameter.