Classes and Test update