Merge "Add leak-checking to unit tests" into nyc-dev