Fix failing tests.

This fixes some but not all the failing tests in the network group.