Fixing token and locale tests