Refactoring Classroom spec