Fix tests based on btcwire changes