Test Fixes - Restore original thread value local after test execution