Merge "Unit tests: Remove duplicated code in ExtensionRegistry"