Some fixes to per-word movement, added pitschie's tests