Test class almost complete