Tests refactoring, FactoriesNS tests added