Fork properly
Update tests to handle an out-of-band fork
Gemfile.lock update