Fix failing tests caused by Bootstrap

[#70409728]
Merge pull request #5 from mkreyman/70409728_fix_failing_tests_caused_by_bootstrap_master

Fix failing tests caused by Bootstrap

[Delivers #70409728]