New dataset classes for easy maintenance of the test data set