Merge branch 'md/test-cleanup'