Fix tests in 1.8