Move where we concatenate expected tokens to handle ignoreErrorOrder

Also update the expected failures now we no longer fail a test.
Our tokenizer currently never outputs adjacent Character tokens; expect this.