Clean up specs, add vcr