test cleanup (remove deliveryType where inappropriate)
add failing test for weirdly sequenced basal re-start before resume
add placeholder for deviceMeta tests and adjust weird basal-resume sequence expectation
Merge branch 'master' into jebeck/add-deviceMeta-etc-tests
Merge branch 'jebeck/add-deviceMeta-etc-tests' into jhbate/carelink_tests