DisplayManager now does something; test code cleanup.