Fix unit tests for boolean operations order
Fixes boolean operations order
More unit tests
Handles after, before
Merge remote-tracking branch 'federico/new-parser' into new-parser

* federico/new-parser:
  Handles after, before
  More unit tests
  Fixes boolean operations order
  Fix unit tests for boolean operations order