@qiongyu, @nkarnik -- fix test round II

@qiongyu, @nkarnik -- fix test round II