Better test coverage
Fix networking
Slightly more coverage