* Companion to #6067

* Fix tests?

* Use AvailableBlockLimit instead of hardcoding the value.

* Bump substrate.