Improve testing and make sure that we test networking.