Fix some bugs add BridgeTest