include tests and patch for old mosaic integration TypeName