5.3 tests fixes