Merge branch 'ma/test-cleanup'