Updated method names
Updated test_tokenizer