fix move in shuffle move that can trigger an assert and add a test