bad merge in VCR was causing test to fail