Re-enabled "location" presence to use RedirectStubResponseHandler
Change the header use from location to id in the callback test
Remove un-used imports