Merge changes Ib0f10385,I1108e62d,If732d23d

* changes:
  Fixed a resource leak in unit tests
  Fixed failed unit tests
  Fixed flaky unit tests