Unify POSTGRESQL test URI fetching
Fix missing imports
Merge remote-tracking branch 'origin/i3-nicer-interface'