Improve data set tests