Merge "optimizing: fix gtests"