refactor and add specs and remove VCR