tokeniser now supports multiple arguments, added tests for the above