Continued refactoring tests
Fixed bug in handling errors in parsing request IDs