Rewrite with easier test display