I think the db tests need a rewrite really but this mostly gets them to work. The trouble is that we have new timing issues due to snapping events to 5s boundaries. I've disabled the least reliable test, but we may need to test at a lower level.
...and fix *those* tests. Phew.