Improve Token service tests