Move more specs over to VCR