Corrected issue with class expectations