added WordServiceTests. Refactor of other tests. Bug fixed.