Merge "Add tests for ExtensionJsonValidator"