Dealing with more of the network-based test cases