Correcting TokenFactory calls on tests
Correcting GenericTokenFactory calls on tests
Correcting GenericTokenFactory calls on tests