Perform initial adaptation if required #3779

The simple patch affects several tests, which the `steps` parameter should not be given. I have not provided a test for this capability but just want to get your opinions. Thanks.