adjusted tests for new parser