fix unit tests

2 jobs for !236 with gcp-enable-hybrid-jwt in 44 minutes and 14 seconds (queued for 1 second)
latest merge request