Applied patch to fix test class_eval bug