Checkpoint after fixing up more feature tests with :vcr