Cleaned up Data class. Changed implementation, so test set created at beginning and is the same throughout