10 Commits (fix-postgres-and-elastic-tests)