Merge "Improve ExtensionRegistry test coverage"