Adding more tests and word_parser refactorization