DcepTest bug fix.
Clean up.