Starting to remove the GMOCK flag