Fixed more compat and utils tests