Merge "Fix and improve TrustManagerServiceTest" into main