Fixes in tests and token is now global to all APIs