Fix failing tests on master

fix some failing tests on master, tested with postgresql