remove helpers
fix test based on token struct changes