improve Cairo test