Better token aware test

Committed passing tests