CIMI - tests modifying to run with other drivers - *don't push*

[rlandy]

These tests require a modified config.yaml - not included in this submission.
Please do not push this patch until we confirm whether we want to keep the 
changes.