Cleanup, + added a testnet