Tests updated to reflect name resolver changes.