Fix slow tests and warnings#1211

janfb merged 2 commits intomainsbi-dev/sbi:mainfrom

fix-slow-tests-and-warningssbi-dev/sbi:fix-slow-tests-and-warningsCopy head branch name to clipboard