DD Tests Cleanup

* Fix and add more regression tests
Automatically ported from CMSSW_7_2_X #5330