Fixed broken 2.38 tests