Improve display tests