Incorrect test for static subnets; few storage leaks still