Remove timeout assertion in network_test
Label tokens in tokenize-arguments

Now you could actually call it a tokenizer.