Change in the structure of classes and tests. Comments have been
translated into English.