Fix broken tests on compat