Changes to client test. Updated gemfile
deleted client test file
deleted gemlock file
Resolved merge conflicts
Added portal code