Done merging Evaluate.c, .h and test codes