Test class alterations. Part 2.