hdmi test program minor cleanup
simplify hdmi test program