Merge "Refactor leak tests"