small unit test fix
Merge branch '3.4.1_Release' into Issue_709_SSO