Fixing Tests.

Still have DataManagerTests to write.