Fixed test_evaluator & test_rect