Fixing DataSet and adding Unit Tests.