Finished movement and made improved the test class