fixed token management system and tests web references