Update test stuff (VCR 2.0, etc.) although more needs to be done