Finished evaluator remapping tests