- Fix a classloading issue in tests (#8459)