Correcting GenericTokenFactory calls on tests