chore: change matchers in test to fix problem on other computers
Merge branch 'master' into osgielresolver