Unit testing in progress. FactoriesNS tests added