added decorators to parser, correct patches for tester