Merge branch 'Fix resource leaks in test_maps'