Updated tests and VCRs