Changed all of the DataManager stuff to the new style, with correct saving of only the stuff that we want to save, and the derived information calculated correctly.
DataManagerTest fails in this build: But it's the same waitForResults problem as before. If you run each of the DataManagerTest test methods separately they run fine, but if you run them all in the same test waitForResults will only return for the first test method to run. I can't figure out what's wrong with it at the moment.