fix failing tests; make saved collections work; make the data reset properly on each flush...