Rework tests, and add a Storm -> Druid end to end test.