finish conversion to gTest