wrote movement test
fixed merge conflicts