fixed tests to handle request identifiers differently.