More work on evaluator and test cases