EMT and CPT added test results, minor updates