In this work, we demonstrate that both capacitance and inductance must be the central parameters associated with the Charged Device Model (CDM) waveform verification modules. We also propose a change from the previously used FR-4 dielectric material substrate to a more stable Alumina. This improves waveform repeatability and will lead to better correlation of test results. This paper completes the groundwork for a full ESDA CDM device testing standard.