Adding more factory tests and allow simple term names to be used in teh term factory