refactorings: FactoryFinder, decorator creation, dispenser (removed reverse order) bug fixes additional tests