fixed broken tests, cache tokens