Made WITH mandatory in xmatch table definitions. Added tests for the parser.