Solve the last error for the last test code from test_Evaluate
The merge conflict had been resolved
Merge pull request #20 from banana93/master

The error for test_Evaluate