fix issues around Counts.resolveFunction and no longer interning string values in TestUtils