fix the bugs in Cross, and basic test on Cross