Fix unit tests
Fix unit tests

GoogleCloudPlatform/testgrid,GoogleCloudPlatform/testgrid,GoogleCloudPlatform/testgrid,GoogleCloudPlatform/testgrid,GoogleCloudPlatform/testgrid,GoogleCloudPlatform/testgrid