Fix Tests in 2.10