Merge "Switch case to suite to follow new gtest naming."