Fix tests for Evaluator and add new algorithms to exercise 2 runner