Fixed request stubs and their tests