correct test-factory
major change in factory structure, allowing for clearer and most straightforward understanding and usage