added complex tokenization tests and continued Complex tokenization implementation