Refactored tests and made vcr call DRY-er