fixup! update cross test
remove unused method, and cover condition branch test
udpate cross tests and benchmark