Dried up the factories.
Remove all conflicts of ancestors.
Refactored tests and added descendants.