Fixing issues with Tests

Fixing a few different tests that are currently causing issues, and the occasional instrumentation failure.
It's kinda tricky, but it should work fine. The reason it likes to know about the data source is that it watches to see if it becomes unavailable during the query. This happens when the Network Data Manager can't connect to elastic search or some other error happens. But all this does is just reduce the time it takes for the tests to fail in that case -- otherwise we'd have to wait for the tests to timeout if it couldn't talk to ES.

But at the end of the day it still just attaches a listener to the IncrementalResult and watches it. So in this case the datamanager would just take a while longer to fail if it ran into an issue.