Fix Movement and associated test.