Adding in tests for regex tokenizer, deprecating old classes