All tests now covered with VCR