Fixed all remaining Network test problems