Revised factory to be traditonal factory

Also, deleted test method that's now obsolete because of this change.