adding tests around ClassDescriptor
removing unnecessary code