Done merging Operator.c, .h and test code