* Fix load of backup store * Tweak type annotations in test * Fix tests * Remove the new test * Remove snapshots