Fixed tests and OPERAND_PATT regex constant