Small refinements in DisplayController and DIsplayControllerTest