Merge branch 'sb/test-helper-excludes'