Trying to solve concurrency bug
Commenting out Pivot tests for now ... something about merge has completely made it unhappy.

Pivot also needs a rethink ... it can't naively use observeOn anymore.