Merge branch 'cleanup-test-ignores'