TokenStream fixes and two more tests