postgresql datastore option always available and fixed python 2 tests