fixing unit tests and adding check for requestContext