Merge "Migrate most of core networking tests to junit4"