Updated some tests to use scruffy client instead of apache client. Added some missing header keys.