Split out files, some testing cleanup
Use VCR for testing