More updates for data set testing