This commit refactors RequestContextHolderTests in preparation for the work to be done in SPR-13211. Issue: SPR-13211