Modifying tests to accommodate new feature definitions on NIC.