Merge "Update expectations for 089-many-methods"