Test Fixes - Restore PrincipalThreadLocal to its original state