ContextCollector
AllCandidatesResolver
Fix testdata for builder inference test in resolve tests - now it's the same between K1 and K2