Added Layout to TokenUtils and tests pass again. Time to make it work.