Make possible to use Factory by its own

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
Additional UTs

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>