Update DerivedClassScanner and ClassScannerTest