Test class related modifications