Minor fixes.
Integrated the DUT.