Merge "Add the tests for ResolverStats"