fixing china test bugs