fixes for functional test
rename pendingRequestId vars/functions