Junhao finish unittesting