Increased code coverage. Added returning classname for ComposerWeave.