Changed logic in  the evaluator. results.replace could wipe out all data
Finalized tests for integrated evaluator