Fixing factory; brings tests back online.