Fix tests
Bug fixes
Disable Postgres