Fix/workaround for unit tests under postgres