More networking tests and tweaks