Some fixes for 5.3 tests.