diff --git a/LibTest/isolate/ReceivePort/firstWhere_A01_t01.dart b/LibTest/isolate/ReceivePort/firstWhere_A01_t01.dart
index c1fe77a08a..48e71c956c 100644
--- a/LibTest/isolate/ReceivePort/firstWhere_A01_t01.dart
+++ b/LibTest/isolate/ReceivePort/firstWhere_A01_t01.dart
@@ -2,22 +2,21 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-/// @assertion Future<T> firstWhere (bool test(T element), {
-/// @deprecated dynamic defaultValue(), T orElse()})
+/// @assertion Future<T> firstWhere(bool test(T element), {T orElse()?})
 ///
 /// Finds the first element of this stream matching test.
 ///
-/// Returns a future that is completed with the first element of this stream that
-/// test returns true for.
+/// Returns a future that is completed with the first element of this stream for
+/// which test returns true.
 ///
-/// If no such element is found before this stream is done, and a orElse function
-/// is provided, the result of calling orElse becomes the value of the future. If
-/// orElse throws, the returned future is completed with that error.
+/// If no such element is found before this stream is done, and an orElse
+/// function is provided, the result of calling orElse becomes the value of the
+/// future. If orElse throws, the returned future is completed with that error.
 ///
-/// If this stream emits an error before the first matching element, the returned
-/// future is completed with that error, and processing stops.
+/// If this stream emits an error before the first matching element, the
+/// returned future is completed with that error, and processing stops.
 ///
-/// Stops listening to the stream after the first matching element or error has
+/// Stops listening to this stream after the first matching element or error has
 /// been received.
 ///
 /// Internally the method cancels its subscription after the first element that
@@ -27,7 +26,6 @@
 /// If an error occurs, or if this stream ends without finding a match and with
 /// no orElse function provided, the returned future is completed with an error.
 ///
-/// The defaultValue parameter is deprecated, and orElse should be used instead.
 /// @description Checks that if element is found, it is passed to the resulting
 /// future.
 /// @author kaigorodov
diff --git a/LibTest/isolate/ReceivePort/firstWhere_A02_t01.dart b/LibTest/isolate/ReceivePort/firstWhere_A02_t01.dart
index db7aa98617..f2bdd72f98 100644
--- a/LibTest/isolate/ReceivePort/firstWhere_A02_t01.dart
+++ b/LibTest/isolate/ReceivePort/firstWhere_A02_t01.dart
@@ -2,22 +2,21 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-/// @assertion Future<T> firstWhere (bool test(T element), {
-/// @deprecated dynamic defaultValue(), T orElse()})
+/// @assertion Future<T> firstWhere(bool test(T element), {T orElse()?})
 ///
 /// Finds the first element of this stream matching test.
 ///
-/// Returns a future that is completed with the first element of this stream that
-/// test returns true for.
+/// Returns a future that is completed with the first element of this stream for
+/// which test returns true.
 ///
-/// If no such element is found before this stream is done, and a orElse function
-/// is provided, the result of calling orElse becomes the value of the future. If
-/// orElse throws, the returned future is completed with that error.
+/// If no such element is found before this stream is done, and an orElse
+/// function is provided, the result of calling orElse becomes the value of the
+/// future. If orElse throws, the returned future is completed with that error.
 ///
-/// If this stream emits an error before the first matching element, the returned
-/// future is completed with that error, and processing stops.
+/// If this stream emits an error before the first matching element, the
+/// returned future is completed with that error, and processing stops.
 ///
-/// Stops listening to the stream after the first matching element or error has
+/// Stops listening to this stream after the first matching element or error has
 /// been received.
 ///
 /// Internally the method cancels its subscription after the first element that
@@ -27,10 +26,9 @@
 /// If an error occurs, or if this stream ends without finding a match and with
 /// no orElse function provided, the returned future is completed with an error.
 ///
-/// The defaultValue parameter is deprecated, and orElse should be used instead.
 /// @description Checks that if this stream ends without finding a match and a
-/// [orElse] function is provided, the result of calling [orElse]
-/// becomes the value of the future.
+/// [orElse] function is provided, the result of calling [orElse] becomes the
+/// value of the future.
 /// @author kaigorodov
 
 import "dart:async";
diff --git a/LibTest/isolate/ReceivePort/firstWhere_A03_t02.dart b/LibTest/isolate/ReceivePort/firstWhere_A03_t02.dart
index 5ba5e8369e..c5f35fc028 100644
--- a/LibTest/isolate/ReceivePort/firstWhere_A03_t02.dart
+++ b/LibTest/isolate/ReceivePort/firstWhere_A03_t02.dart
@@ -2,22 +2,21 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-/// @assertion Future<T> firstWhere (bool test(T element), {
-/// @deprecated dynamic defaultValue(), T orElse()})
+/// @assertion Future<T> firstWhere(bool test(T element), {T orElse()?})
 ///
 /// Finds the first element of this stream matching test.
 ///
-/// Returns a future that is completed with the first element of this stream that
-/// test returns true for.
+/// Returns a future that is completed with the first element of this stream for
+/// which test returns true.
 ///
-/// If no such element is found before this stream is done, and a orElse function
-/// is provided, the result of calling orElse becomes the value of the future. If
-/// orElse throws, the returned future is completed with that error.
+/// If no such element is found before this stream is done, and an orElse
+/// function is provided, the result of calling orElse becomes the value of the
+/// future. If orElse throws, the returned future is completed with that error.
 ///
-/// If this stream emits an error before the first matching element, the returned
-/// future is completed with that error, and processing stops.
+/// If this stream emits an error before the first matching element, the
+/// returned future is completed with that error, and processing stops.
 ///
-/// Stops listening to the stream after the first matching element or error has
+/// Stops listening to this stream after the first matching element or error has
 /// been received.
 ///
 /// Internally the method cancels its subscription after the first element that
@@ -27,9 +26,8 @@
 /// If an error occurs, or if this stream ends without finding a match and with
 /// no orElse function provided, the returned future is completed with an error.
 ///
-/// The defaultValue parameter is deprecated, and orElse should be used instead.
-/// @description Checks that if this stream ends without finding a match and with
-/// no [orElse] function provided, the future will receive an error.
+/// @description Checks that if this stream ends without finding a match and
+/// with no [orElse] function provided, the future will receive an error.
 /// @author kaigorodov
 
 import "dart:async";
diff --git a/LibTest/isolate/ReceivePort/lastWhere_A01_t01.dart b/LibTest/isolate/ReceivePort/lastWhere_A01_t01.dart
index 8cbed2ddb3..843b3b5b05 100644
--- a/LibTest/isolate/ReceivePort/lastWhere_A01_t01.dart
+++ b/LibTest/isolate/ReceivePort/lastWhere_A01_t01.dart
@@ -2,19 +2,25 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-/// @assertion Future<T> lastWhere (bool test(T element),
-///     {@deprecated dynamic defaultValue(),  T orElse()})
+/// @assertion Future<T> lastWhere(bool test(T element), {T orElse()?})
 ///
 /// Finds the last element in this stream matching test.
 ///
-/// If this stream emits an error, the returned future is completed with that
-/// error, and processing stops.
+/// Returns a future that is completed with the last element of this stream for
+/// which test returns true.
 ///
-/// Otherwise as firstWhere, except that the last matching element is found
-/// instead of the first. That means that a non-error result cannot be provided
-/// before this stream is done.
+/// If no such element is found before this stream is done, and an orElse
+/// function is provided, the result of calling orElse becomes the value of the
+/// future. If orElse throws, the returned future is completed with that error.
+///
+/// If this stream emits an error at any point, the returned future is completed
+/// with that error, and the subscription is canceled.
+///
+/// A non-error result cannot be provided before this stream is done.
+///
+/// Similar too firstWhere, except that the last matching element is found
+/// instead of the first.
 ///
-/// The defaultValue parameter is deprecated, and orElse should be used instead.
 /// @description Checks that if element is found, it is passed to the resulting
 /// future.
 /// @author kaigorodov
diff --git a/LibTest/isolate/ReceivePort/lastWhere_A02_t01.dart b/LibTest/isolate/ReceivePort/lastWhere_A02_t01.dart
index b714dec2f2..03bd530ba8 100644
--- a/LibTest/isolate/ReceivePort/lastWhere_A02_t01.dart
+++ b/LibTest/isolate/ReceivePort/lastWhere_A02_t01.dart
@@ -2,19 +2,25 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-/// @assertion Future<T> lastWhere (bool test(T element),
-///     {@deprecated dynamic defaultValue(),  T orElse()})
+/// @assertion Future<T> lastWhere(bool test(T element), {T orElse()?})
 ///
 /// Finds the last element in this stream matching test.
 ///
-/// If this stream emits an error, the returned future is completed with that
-/// error, and processing stops.
+/// Returns a future that is completed with the last element of this stream for
+/// which test returns true.
 ///
-/// Otherwise as firstWhere, except that the last matching element is found
-/// instead of the first. That means that a non-error result cannot be provided
-/// before this stream is done.
+/// If no such element is found before this stream is done, and an orElse
+/// function is provided, the result of calling orElse becomes the value of the
+/// future. If orElse throws, the returned future is completed with that error.
+///
+/// If this stream emits an error at any point, the returned future is completed
+/// with that error, and the subscription is canceled.
+///
+/// A non-error result cannot be provided before this stream is done.
+///
+/// Similar too firstWhere, except that the last matching element is found
+/// instead of the first.
 ///
-/// The defaultValue parameter is deprecated, and orElse should be used instead.
 /// @description Checks that if this stream ends without finding a match and an
 /// [orElse] function is provided, the result of calling [orElse] becomes the
 /// value of the future.
diff --git a/LibTest/isolate/ReceivePort/lastWhere_A04_t01.dart b/LibTest/isolate/ReceivePort/lastWhere_A04_t01.dart
index 21d94c39c5..fb0936ebcc 100644
--- a/LibTest/isolate/ReceivePort/lastWhere_A04_t01.dart
+++ b/LibTest/isolate/ReceivePort/lastWhere_A04_t01.dart
@@ -2,21 +2,27 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-/// @assertion Future<T> lastWhere (bool test(T element),
-///     {@deprecated dynamic defaultValue(),  T orElse()})
+/// @assertion Future<T> lastWhere(bool test(T element), {T orElse()?})
 ///
 /// Finds the last element in this stream matching test.
 ///
-/// If this stream emits an error, the returned future is completed with that
-/// error, and processing stops.
+/// Returns a future that is completed with the last element of this stream for
+/// which test returns true.
 ///
-/// Otherwise as firstWhere, except that the last matching element is found
-/// instead of the first. That means that a non-error result cannot be provided
-/// before this stream is done.
+/// If no such element is found before this stream is done, and an orElse
+/// function is provided, the result of calling orElse becomes the value of the
+/// future. If orElse throws, the returned future is completed with that error.
 ///
-/// The defaultValue parameter is deprecated, and orElse should be used instead.
-/// @description Checks that if this stream ends without finding a match and with
-/// no [orElse] function provided, the future will receive an error.
+/// If this stream emits an error at any point, the returned future is completed
+/// with that error, and the subscription is canceled.
+///
+/// A non-error result cannot be provided before this stream is done.
+///
+/// Similar too firstWhere, except that the last matching element is found
+/// instead of the first.
+///
+/// @description Checks that if this stream ends without finding a match and
+/// with no [orElse] function provided, the future will receive an error.
 /// @author kaigorodov
 
 import "dart:async";