DataManagerTest created

Also a whole bunch of misc cleanups in other files (mostly removing
stray includes) and some changes to DataManager’s constructor