Fix tests in 5.3