Merge branch 'jn/test-cleanup-7006' * jn/test-cleanup-7006: test: errors preparing for a test are not special