Fix unstable test cases.
Fix signature.