make sure userPartnerIdInUrl flag is always set
update tests
updated to work with or without api keys