Almost complete fix of issue #3, word movement and tests