Implemented methods to demarcate token and tests for them