Refactor evaluator to not need afterDispatch method
Add tests for evaluator