Updated selected calls to take subnet/network interface instances as a parameter instead of strings
Updated tests
Fixed a typo