Cleaning up some errant dcmi_type code, and test code