Fix test suite compilation with network 2.6
Make test suite network dependencies more robust