More detailed tests for the parser
Cleaner commands