[UPDATD] More clean-up & polish Production Test code to use the LCD