Done merging OperatorToken.c, .h and test codes