Merge branch 'rs/test-cleanup'