Merge "Adjust ClassLoaderFactory tests after API change"