Adding json token output to TokenStream
Changing tokens format for tests