Merge "ModuleLicenseProviderTest converted to JUnit"