[Yujun] Added more tests.