Change network cidr tests to use containers