Updated move capability. Added unit tests