Stable tests for bypass
Fix APIs