LPS-40048 Keep previous logic in place. Removing the ThreadLocal has changed it
LPS-22629 Fix test