Bring MockNetwork and Network interfaces in line in preperation for
combining them into a single class.