Fix existing tests for postgres upgrade
Drop back to strict_one=False

We don't have good enough test coverage to not use this right now.