Merge "avoid resource leaks in keypairs tests"