Feature/fix existing network failure tests and add more #3724