Fix failing tests + verified build-out#2

cognis-digital wants to merge 2 commits into

maincognis-digital/modpot:mainfrom

cognis-audit/buildoutcognis-digital/modpot:cognis-audit/buildoutCopy head branch name to clipboard