fix last phrase
fixing tests and convert to constructor