Merge "Improve resource leakage detection testing"