Moved components around, added tests for minor grammar components
Disable pyparsings arity trimming