JOINDIN-249 - More tests for Request object, minor refactoring