Cleaned up specs, fix VCR