Add message to pending tests
Fix pending cases regarding token inputs

Expand test suite