fix test errors post postgres merge
merge with postgres main