changed data handling, bug fixes
most tests are currently broken
DataProvider fixes, updates for tests