@qiongyu -- fix tests

@qiongyu -- fix tests