Snapshot and restore fixes
Renamed ENV vars
Postgres tests