Building a set of test phrases and also improved the performance and correctness of splitting phrases into previous and next word(s).