fixed tests, corrected VCR issues