test + fix network implementations