Merge branch 'tb/mark-more-tests-as-leak-free'