Fix pending cases regarding token inputs

Expand test suite