Improved EvaluatorsTest and fixed number evaluator small bug