Postgres: Adjustments for postgres datastore. Fixed tests
POSTGRES bumped submodules