Fixing issues with Tests

Fixing a few different tests that are currently causing issues, and the occasional instrumentation failure.
Doesn't having this extend DataManagerTester in this way make the waitForResults call only use the LocalDataManager? Could this potentially cause issues in testing if we wait for local data results, but then the data manager returns something different due to the network data?