cleaning up data unit tests, taking testable code out of data manager