More display tests and supporting code and clean up code