reduce duplicate vcr requests and improve test coverage