Update doGenerate routing definition
CS
Fixed coreTest