Extend test data set size. Fix some issues.