Part of #17840 I haven't made any changes or additions to the tests themselves, just moved the tests over and updated to match. --------- Co-authored-by: Bartek Iwańczuk <biwanczuk@gmail.com>
