FOCUS-4510 Fix build of gcm tests, fix two problematic tests.