Fix tests to allow for extra request headers in Ruby 1.9

Change-Id: Ia0679eac335bfa0f17c36ae25a313663e6e58795
And another attempt at 1.9 fixes

Change-Id: I50286c5820a6d315273815fd9e5328c291ffec06