Tokeniser mostly working: some failing tests ...