made branch testnet friendly