Fix tests on R16