Remove single fetch response stub, add headers (#9769)

Remove single fetch response stub, add headers (#9769) #46