Clean java warnings on DataManager tests.

Some of the data manager tests had warnings and include errors from previous merges. Resolving and cleaning all of these.