All tests passing, and using vcr to make tests fast again