Testnet + small tweaks