CLDIDE-2043: enable factory tests, rework them
CLDIDE-2043: fix factory builder
CLDIDE-2043: addd factory tests