Changed format of test set