Update tests to be compatible with recent gcf builds.

[#62677922]

Signed-off-by: Maria Shaldibina <mariash@pivotallabs.com>