Updates test issues

- Accidentally committed unresolved conflicts.
- Regenerates cassettes.
- Updates Gemfile.lock to latest generated output from Bundle Install.