putting webmock and vcr back in the mix