Add better resolver coverage.