* minor naming updates
* Added test for DataSet composition