Class Improvement.Mock