Fix the wrong fallback on token and add a new test to catch this kind of errors early. Signed-off-by: Carlo Caione <ccaione@baylibre.com>