Almost done fixing the tests for 5.18