Adapted the Dataset importer for new test format