Improve tests to not depending on order returned by the DB
Increase the pool timeout if it fixes the test "PG::UnableToSend: no connection to the server"
Auto-merge remote-tracking branch 'upstream/master'