Updated tests and apparenlty types to fit new CPT constructor