Merge "Migrating remaining core networking tests to Junit4"