Fixed Testnet support