Fixes regressions in CommandParserTest