Fixed bug in Tokenizer around whitespace; added test