More progress on evaluator refactor and tests; 44 of 48 tests passing.