Improved test, documented API, but VCR needs to be fixed