Snapshot and restore fixes
Postgres v2 tests