Various fixes to make basic unit tests pass

Hi,

These fixes should make 'drivers:mock', 'cimi' and some other tests green. However the entire 'test' suite will not pass, since it seems like there is some problem with 'aws' gem (VCR fixtures will need to be re-recorded).