Add DataSource properties. Fix bug in setTestData2D().