Implement VCR and change a few tests