Further fixes to the ClassPathScannerSmallTest