diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65a1c7d8..38ce9a64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,50 @@
 Changelog
 =========
 
+## [v1.9.0]
+
+### New Cisco Resources
+* EVPN Multisite
+  * evpn_multisite (@rahushen)
+  * evpn_stormcontrol (@rahushen)
+  * interface_evpn_multisite (@rahushen)
+
+* TRM
+  * evpn_multicast (@rahushen)
+  * ip_multicast (@rahushen)
+
+### Added
+* Extend vxlan_vtep with attributes:
+   * `multisite_border_gateway_interface`
+
+* Extend vxlan_vtep_vni with attributes:
+   * `multisite_ingress_replication`
+
+* Extend bgp_neighbor with attributes:
+   * `peer_type`
+
+* Extend bgp_neighbor_af with attributes:
+   * `rewrite_evpn_rt_asn`
+
+* Extend vrf_af with attributes:
+   * `route_target_both_auto_mvpn`
+   * `route_target_export_mvpn`
+   * `route_target_import_mvpn`
+
+* Extend feature with attributes:
+  * `ngmvpn_enable`
+  * `ngmvpn_disable`
+  * `ngmvpn_enabled?`
+
+### Changed
+
+### Removed
+
+### Issues Addressed
+
 ## [v1.8.0]
 
-#### Cisco Resources
+### New Cisco Resources
 * ObjectGroup
   * object_group (@saichint)
   * object_group_entry (@saichint)
@@ -513,6 +554,7 @@ Changelog
 [git-flow]: https://github.com/petervanderdoes/gitflow-avh
 [SimpleCov]: https://github.com/colszowka/simplecov
 
+[v1.9.0]: https://github.com/cisco/cisco-network-node-utils/compare/v1.8.0...v1.9.0
 [v1.8.0]: https://github.com/cisco/cisco-network-node-utils/compare/v1.7.0...v1.8.0
 [v1.7.0]: https://github.com/cisco/cisco-network-node-utils/compare/v1.6.0...v1.7.0
 [v1.6.0]: https://github.com/cisco/cisco-network-node-utils/compare/v1.5.0...v1.6.0
diff --git a/README.md b/README.md
index c00ed6ac..c441d9eb 100644
--- a/README.md
+++ b/README.md
@@ -42,8 +42,8 @@ This CiscoNodeUtils gem release supports the following:
 
 Platform          | OS     | OS Version           |
 ------------------|--------|----------------------|
-Cisco Nexus N9k   | NX-OS  | 7.0(3)I2(1) and later
-Cisco Nexus N3k   | NX-OS  | 7.0(3)I2(1) and later
+Cisco Nexus N9k   | NX-OS  | 7.0(3)I2(5) and later
+Cisco Nexus N3k   | NX-OS  | 7.0(3)I2(5) and later
 Cisco Nexus N3K-F | NX-OS  | 7.0(3)F3(2) and later
 Cisco Nexus N5k   | NX-OS  | 7.3(0)N1(1) and later
 Cisco Nexus N6k   | NX-OS  | 7.3(0)N1(1) and later
@@ -91,7 +91,7 @@ An example configuration file (illustrating each of the above scenarios) is prov
 
 The `Client` class provides a low-level interface for communicating with the Cisco network node. It provides the base APIs `create`, `get`, and `set`.
 
-* `Cisco::Client::NXAPI` - client for communicating with NX-OS 7.0(3)I2(1) and later, using NX-API.
+* `Cisco::Client::NXAPI` - client for communicating with NX-OS 7.0(3)I2(5) and later, using NX-API.
 
 For a greater level of abstraction, the `Node` class is generally used, but the `Client` classes can be invoked directly if desired.
 
@@ -217,7 +217,7 @@ See [CHANGELOG](CHANGELOG.md) for a list of changes.
 ## <a name="license_info">License Information</a>
 
 
-Copyright (c) 2013-2017 Cisco and/or its affiliates.
+Copyright (c) 2013-2018 Cisco and/or its affiliates.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/docs/README-maintainers.md b/docs/README-maintainers.md
index c47096b5..205c0d17 100644
--- a/docs/README-maintainers.md
+++ b/docs/README-maintainers.md
@@ -25,6 +25,7 @@ When we are considering publishing a new release, all of the following steps mus
 1. Run full minitest regression on [supported platforms.](https://github.com/cisco/cisco-network-node-utils#overview)
     * Fix All Bugs.
     * Make sure proper test case skips are in place for unsupported platforms.
+    * Make sure [yum_package.yaml](../tests/yum_package.yaml) is updated with all versions that need to be tested.
 
 1. Build gem and test it in combination with the latest released Puppet module (using Beaker and demo manifests) to make sure no backward compatibility issues have been introduced.
 
diff --git a/lib/cisco_node_utils/bgp_neighbor.rb b/lib/cisco_node_utils/bgp_neighbor.rb
index ecf136f9..dd41c471 100644
--- a/lib/cisco_node_utils/bgp_neighbor.rb
+++ b/lib/cisco_node_utils/bgp_neighbor.rb
@@ -503,5 +503,25 @@ def mode_cli_to_symbol(cli)
         fail KeyError
       end
     end
+
+    def default_peer_type
+      config_get_default('bgp_neighbor', 'peer_type')
+    end
+
+    def peer_type=(val)
+      if val == default_peer_type
+        @set_args[:state] = 'no'
+        @set_args[:peer_type] = ''
+      else
+        Feature.nv_overlay_evpn_enable
+        @set_args[:peer_type] = val
+        @set_args[:state] = ''
+      end
+      config_set('bgp_neighbor', 'peer_type', @set_args)
+    end
+
+    def peer_type
+      config_get('bgp_neighbor', 'peer_type', @get_args)
+    end
   end # class
 end # module
diff --git a/lib/cisco_node_utils/bgp_neighbor_af.rb b/lib/cisco_node_utils/bgp_neighbor_af.rb
index 15d3b5b4..4ec4d317 100644
--- a/lib/cisco_node_utils/bgp_neighbor_af.rb
+++ b/lib/cisco_node_utils/bgp_neighbor_af.rb
@@ -756,5 +756,25 @@ def weight=(int)
     def default_weight
       config_get_default('bgp_neighbor_af', 'weight')
     end
+
+    def rewrite_evpn_rt_asn
+      config_get('bgp_neighbor_af', 'rewrite_evpn_rt_asn', @get_args)
+    end
+
+    def rewrite_evpn_rt_asn=(state)
+      Feature.nv_overlay_evpn_enable if state
+      set_args_keys(state: (state ? '' : 'no'))
+      if @set_args[:state] == 'no'
+        unless rewrite_evpn_rt_asn == default_rewrite_evpn_rt_asn
+          config_set('bgp_neighbor_af', 'rewrite_evpn_rt_asn', @set_args)
+        end
+      else
+        config_set('bgp_neighbor_af', 'rewrite_evpn_rt_asn', @set_args)
+      end
+    end
+
+    def default_rewrite_evpn_rt_asn
+      config_get_default('bgp_neighbor_af', 'rewrite_evpn_rt_asn')
+    end
   end
 end
diff --git a/lib/cisco_node_utils/cmd_ref/bgp_neighbor.yaml b/lib/cisco_node_utils/cmd_ref/bgp_neighbor.yaml
index 23aaeb62..231290de 100644
--- a/lib/cisco_node_utils/cmd_ref/bgp_neighbor.yaml
+++ b/lib/cisco_node_utils/cmd_ref/bgp_neighbor.yaml
@@ -114,6 +114,13 @@ password_type:
     get_value: '/^password (\d+)/'
     default_value: 0
 
+peer_type:
+  _exclude: [ios_xr, N3k, N3k-F, N5k, N6k, N7k, N9k-F]
+  kind: string
+  get_value: '/^peer-type (\S+)$/'
+  set_value: '<state> peer-type <peer_type>'
+  default_value: ""
+
 remote_as:
   get_value: '/^remote-as (\d*?.?\d+?)$/'
   set_value: '<state> remote-as <remote_as>'
diff --git a/lib/cisco_node_utils/cmd_ref/bgp_neighbor_af.yaml b/lib/cisco_node_utils/cmd_ref/bgp_neighbor_af.yaml
index 5cfc937d..a93daf78 100644
--- a/lib/cisco_node_utils/cmd_ref/bgp_neighbor_af.yaml
+++ b/lib/cisco_node_utils/cmd_ref/bgp_neighbor_af.yaml
@@ -146,6 +146,13 @@ prefix_list_out:
   set_value: '<state> prefix-list <str> out'
   default_value: ''
 
+rewrite_evpn_rt_asn:
+  _exclude: [ios_xr, N3k, N3k-F, N5k, N6k, N7k, N9k-F]
+  kind: boolean
+  get_value: '/^rewrite-evpn-rt-asn$/'
+  set_value: '<state> rewrite-evpn-rt-asn'
+  default_value: false
+
 route_map_in:
   kind: string
   default_value: ''
diff --git a/lib/cisco_node_utils/cmd_ref/evpn_multicast.yaml b/lib/cisco_node_utils/cmd_ref/evpn_multicast.yaml
new file mode 100644
index 00000000..cff05cc9
--- /dev/null
+++ b/lib/cisco_node_utils/cmd_ref/evpn_multicast.yaml
@@ -0,0 +1,12 @@
+# evpn_multicast.yaml
+---
+_exclude: [ios_xr, N3k, N3k-F, N5k, N6k, N7k, N9k-F]
+
+_template:
+  get_command: "show running-config | section advertise"
+
+multicast:
+  context: ~
+  get_value: '^advertise evpn multicast$'
+  set_value: "<state> advertise evpn multicast"
+  default_value: ''
diff --git a/lib/cisco_node_utils/cmd_ref/evpn_multisite.yaml b/lib/cisco_node_utils/cmd_ref/evpn_multisite.yaml
new file mode 100644
index 00000000..118a4848
--- /dev/null
+++ b/lib/cisco_node_utils/cmd_ref/evpn_multisite.yaml
@@ -0,0 +1,18 @@
+# evpn_multisite.yaml
+---
+_exclude: [ios_xr, N3k, N3k-F, N5k, N6k, N7k, N9k-F]
+
+_template:
+  get_command: "show running-config | section multisite"
+
+delay_restore:
+  default_value: ""
+  get_context: ['/^evpn multisite border-gateway <multisiteid>$/']
+  get_value: '/^delay-restore\s+time\s+(\d+)$/'
+  set_context: ['evpn multisite border-gateway <multisiteid>']
+  set_value: "<state> delay-restore time <time>"
+
+multisite:
+  context: ~
+  get_value: 'evpn multisite border-gateway ([\d.]+)'
+  set_value: "<state> evpn multisite border-gateway <multisiteid>"
diff --git a/lib/cisco_node_utils/cmd_ref/evpn_stormcontrol.yaml b/lib/cisco_node_utils/cmd_ref/evpn_stormcontrol.yaml
new file mode 100644
index 00000000..f229494b
--- /dev/null
+++ b/lib/cisco_node_utils/cmd_ref/evpn_stormcontrol.yaml
@@ -0,0 +1,18 @@
+# evpn_stormcontrol.yaml
+---
+_exclude: [ios_xr, N3k, N3k-F, N5k, N6k, N7k, N9k-F]
+
+_template:
+  get_command: "show running-config | section storm-control"
+
+broadcast:
+  get_value: 'evpn storm-control broadcast level ([\d.]+)'
+  set_value: "<state> evpn storm-control broadcast level <level>"
+
+multicast:
+  get_value: 'evpn storm-control multicast level ([\d.]+)'
+  set_value: "<state> evpn storm-control multicast level <level>"
+
+unicast:
+  get_value: 'evpn storm-control unicast level ([\d.]+)'
+  set_value: "<state> evpn storm-control unicast level <level>"
diff --git a/lib/cisco_node_utils/cmd_ref/feature.yaml b/lib/cisco_node_utils/cmd_ref/feature.yaml
index 81b869a7..bd0fde8a 100644
--- a/lib/cisco_node_utils/cmd_ref/feature.yaml
+++ b/lib/cisco_node_utils/cmd_ref/feature.yaml
@@ -52,6 +52,13 @@ lacp:
   get_value: '/^feature lacp$/'
   set_value: "feature lacp"
 
+ngmvpn:
+  _exclude: [N3k, N3k-F, N5k, N6k, N7k, N9k-F]
+  os_version: 'N9k:7.0.3.I7.1'
+  kind: boolean
+  get_value: '/^feature ngmvpn$/'
+  set_value: "<state> feature ngmvpn"
+
 nv_overlay:
   # N3k - native vxlan support in a future release
   _exclude: [N3k]
diff --git a/lib/cisco_node_utils/cmd_ref/interface_evpn_multisite.yaml b/lib/cisco_node_utils/cmd_ref/interface_evpn_multisite.yaml
new file mode 100644
index 00000000..52ec3e5e
--- /dev/null
+++ b/lib/cisco_node_utils/cmd_ref/interface_evpn_multisite.yaml
@@ -0,0 +1,17 @@
+# interface_evpn_multisite
+---
+_exclude: [ios_xr, N3k, N3k-F, N5k, N6k, N7k, N9k-F]
+
+_template:
+  get_command: "show running interface all"
+  context:
+    - "interface <interface>"
+
+all_interfaces:
+  multiple:
+  get_context: ~
+  get_value: '/^interface (.*)/'
+
+evpn_multisite:
+  get_value: '/^evpn multisite (\S+)$/'
+  set_value: "<state> evpn multisite <tracking>"
diff --git a/lib/cisco_node_utils/cmd_ref/ip_multicast.yaml b/lib/cisco_node_utils/cmd_ref/ip_multicast.yaml
new file mode 100644
index 00000000..bfd0e330
--- /dev/null
+++ b/lib/cisco_node_utils/cmd_ref/ip_multicast.yaml
@@ -0,0 +1,18 @@
+# ip_multicast.yaml
+---
+_exclude: [ios_xr, N3k, N3k-F, N5k, N6k, N7k, N9k-F]
+
+_template:
+  get_command: "show running-config | section 'ip multicast'"
+
+overlay_distributed_dr:
+  context: ~
+  get_value: '^ip multicast overlay-distributed-dr$'
+  set_value: "<state> ip multicast overlay-distributed-dr"
+  default_value: false
+
+overlay_spt_only:
+  context: ~
+  get_value: '^ip multicast overlay-spt-only$'
+  set_value: "<state> ip multicast overlay-spt-only"
+  default_value: false
diff --git a/lib/cisco_node_utils/cmd_ref/vrf_af.yaml b/lib/cisco_node_utils/cmd_ref/vrf_af.yaml
index 1d7ca892..87ed344c 100644
--- a/lib/cisco_node_utils/cmd_ref/vrf_af.yaml
+++ b/lib/cisco_node_utils/cmd_ref/vrf_af.yaml
@@ -52,6 +52,13 @@ route_target_both_auto_evpn:
   set_value: '<state> route-target both auto evpn'
   default_value: false
 
+route_target_both_auto_mvpn:
+  _exclude: [ios_xr, N3k, N3k-F, N5k, N6k, N7k, N9k-F]
+  kind: boolean
+  get_value: '/^route-target both auto mvpn$/'
+  set_value: '<state> route-target both auto mvpn'
+  default_value: false
+
 route_target_export:
   multiple: true
   default_value: []
@@ -73,6 +80,13 @@ route_target_export_evpn:
   set_value: '<state> route-target export <community> evpn'
   default_value: []
 
+route_target_export_mvpn:
+  _exclude: [ios_xr, N3k, N3k-F, N5k, N6k, N7k, N9k-F]
+  multiple: true
+  get_value: '/^route-target export (\S+) mvpn$/'
+  set_value: '<state> route-target export <community> mvpn'
+  default_value: []
+
 route_target_export_stitching:
   _exclude: [nexus]
   multiple: true
@@ -105,6 +119,13 @@ route_target_import_evpn:
   set_value: '<state> route-target import <community> evpn'
   default_value: []
 
+route_target_import_mvpn:
+  _exclude: [ios_xr, N3k, N3k-F, N5k, N6k, N7k, N9k-F]
+  multiple: true
+  get_value: '/^route-target import (\S+) mvpn$/'
+  set_value: '<state> route-target import <community> mvpn'
+  default_value: []
+
 route_target_import_stitching:
   _exclude: [nexus]
   multiple: true
diff --git a/lib/cisco_node_utils/cmd_ref/vxlan_vtep.yaml b/lib/cisco_node_utils/cmd_ref/vxlan_vtep.yaml
index 7ad817d5..14ac75fc 100644
--- a/lib/cisco_node_utils/cmd_ref/vxlan_vtep.yaml
+++ b/lib/cisco_node_utils/cmd_ref/vxlan_vtep.yaml
@@ -39,6 +39,12 @@ mt_lite_support:
     # this feature is always off on these platforms and cannot be changed
     default_only: false
 
+multisite_bg_intf:
+    _exclude: [N3k-F, N5k, N6k, N7k, N9k-F]
+    get_value: '/^multisite border\-gateway interface (\S+)$/'
+    set_value: '<state> multisite border-gateway interface <lpbk_intf>'
+    default_value: ''
+
 shutdown:
   kind: boolean
   get_value: '/^no shutdown$/'
diff --git a/lib/cisco_node_utils/cmd_ref/vxlan_vtep_vni.yaml b/lib/cisco_node_utils/cmd_ref/vxlan_vtep_vni.yaml
index 0e45fcf0..65bf23b3 100644
--- a/lib/cisco_node_utils/cmd_ref/vxlan_vtep_vni.yaml
+++ b/lib/cisco_node_utils/cmd_ref/vxlan_vtep_vni.yaml
@@ -27,6 +27,13 @@ multicast_group:
   set_value: '<state> mcast-group <ip_start> <ip_end>'
   default_value: ''
 
+multisite_ingress_replication:
+  _exclude: [N3k-F, N5k, N6k, N7k, N9k-F]
+  kind: boolean
+  get_value: '/^multisite ingress-replication$/'
+  set_value: '<state> multisite ingress-replication'
+  default_value: false
+
 peer_list:
   _exclude: [N5k, N6k, N7k]
   multiple:
diff --git a/lib/cisco_node_utils/evpn_multicast.rb b/lib/cisco_node_utils/evpn_multicast.rb
new file mode 100644
index 00000000..3ae0421d
--- /dev/null
+++ b/lib/cisco_node_utils/evpn_multicast.rb
@@ -0,0 +1,66 @@
+# January 2018, Rahul Shenoy
+#
+# Copyright (c) 2018 Cisco and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative 'cisco_cmn_utils'
+require_relative 'node_util'
+require_relative 'feature'
+
+module Cisco
+  # node_utils class for evpn_multisite
+  class EvpnMulticast < NodeUtil
+    def initialize
+      @get_args = @set_args = {}
+      create
+    end
+
+    def create
+      return unless multicast == default_multicast
+      Feature.ngmvpn_enable
+      config_set('feature', 'nv_overlay', state: '')
+      @set_args[:state] = ''
+      config_set('evpn_multicast', 'multicast', @set_args)
+    end
+
+    def destroy
+      @set_args[:state] = 'no'
+      config_set('evpn_multicast', 'multicast', @set_args)
+    end
+
+    def self.multicast
+      config_get('evpn_multicast', 'multicast')
+    end
+
+    def multicast
+      config_get('evpn_multicast', 'multicast')
+    end
+
+    def multicast=(bool)
+      fail TypeError unless [true, false].include?(bool)
+      @set_args[:state] = bool ? '' : 'no'
+      if @set_args[:state] == 'no'
+        unless multicast == default_multicast
+          config_set('evpn_multicast', 'multicast', @set_args)
+        end
+      else
+        config_set('evpn_multicast', 'multicast', @set_args)
+      end
+    end
+
+    def default_multicast
+      config_get_default('evpn_multicast', 'multicast')
+    end
+  end
+end
diff --git a/lib/cisco_node_utils/evpn_multisite.rb b/lib/cisco_node_utils/evpn_multisite.rb
new file mode 100644
index 00000000..b64bfd0b
--- /dev/null
+++ b/lib/cisco_node_utils/evpn_multisite.rb
@@ -0,0 +1,96 @@
+# October 2017, Rahul Shenoy
+#
+# Copyright (c) 2017 Cisco and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative 'cisco_cmn_utils'
+require_relative 'node_util'
+require_relative 'feature'
+
+module Cisco
+  # node_utils class for evpn_multisite
+  class EvpnMultisite < NodeUtil
+    attr_reader :multisiteid, :time
+
+    def initialize(multisiteid, instantiate=true)
+      err_msg = "multisiteid must be either a 'String' or an" \
+                " 'Integer' object"
+      fail ArgumentError, err_msg unless multisiteid.is_a?(Integer) ||
+                                         multisiteid.is_a?(String)
+      @multisiteid = multisiteid.to_i
+      @get_args = @set_args = { multisiteid: @multisiteid }
+      create if instantiate
+    end
+
+    def create
+      # There is an issue with EX platform using
+      # Feature.nv_overlay_enable generating error code '400'
+      # Using config_set for enabling nv overlay
+      config_set('feature', 'nv_overlay', state: '')
+      sleep 1
+      @set_args[:state] = ''
+      config_set('evpn_multisite', 'multisite', @set_args)
+    end
+
+    def destroy
+      @set_args[:state] = 'no'
+      # HACK: set time to a dummy value
+      @set_args[:time] = 30
+      config_set('evpn_multisite', 'delay_restore', @set_args)
+      config_set('evpn_multisite', 'multisite', @set_args)
+    end
+
+    def self.multisite
+      nu_obj = nil
+      ms_id = config_get('evpn_multisite', 'multisite')
+      nu_obj = EvpnMultisite.new(ms_id, false) if ms_id
+      nu_obj
+    end
+
+    def multisite
+      config_get('evpn_multisite', 'multisite')
+    end
+
+    def multisite=(multisiteid)
+      err_msg = "multisiteid must be either a 'String' or an" \
+                " 'Integer' object"
+      fail ArgumentError, err_msg unless multisiteid.is_a?(Integer) ||
+                                         multisiteid.is_a?(String)
+      @multisiteid = multisiteid.to_i
+      @set_args[:multisiteid] = @multisiteid
+      config_set('evpn_multisite', 'multisite', @set_args)
+    end
+
+    def delay_restore
+      config_get('evpn_multisite', 'delay_restore', @get_args)
+    end
+
+    def delay_restore=(time)
+      # HACK: set a dummy time value when removing the property
+      dummy_time = 30
+      if time == default_delay_restore
+        @set_args[:state] = 'no'
+        @set_args[:time] = dummy_time
+      else
+        @set_args[:time] = time
+        @set_args[:state] = '' unless @set_args[:state]
+      end
+      config_set('evpn_multisite', 'delay_restore', @set_args)
+    end
+
+    def default_delay_restore
+      config_get_default('evpn_multisite', 'delay_restore')
+    end
+  end
+end
diff --git a/lib/cisco_node_utils/evpn_stormcontrol.rb b/lib/cisco_node_utils/evpn_stormcontrol.rb
new file mode 100644
index 00000000..4e8d9d31
--- /dev/null
+++ b/lib/cisco_node_utils/evpn_stormcontrol.rb
@@ -0,0 +1,84 @@
+# October 2017, Rahul Shenoy
+#
+# Copyright (c) 2017 Cisco and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative 'cisco_cmn_utils'
+require_relative 'node_util'
+require_relative 'feature'
+
+module Cisco
+  # node_utils class for evpn_stormcontrol
+  class EvpnStormcontrol < NodeUtil
+    attr_reader :stormcontrol_type, :level
+
+    def initialize(stormcontrol_type, level, instantiate=true)
+      err_msg = 'storm control type must be one of the following:' \
+                ' broadcast, multicast or unicast'
+      type_list = %w(broadcast multicast unicast)
+      fail ArgumentError, err_msg unless type_list.include?(stormcontrol_type)
+      @stormcontrol_type = stormcontrol_type
+
+      err_msg = "level must be either a 'String' or an" \
+                " 'Integer' object"
+      fail ArgumentError, err_msg unless level.is_a?(Integer) ||
+                                         level.is_a?(String)
+      @level = level.to_i
+      @get_args = @set_args = { stormcontrol_type: @stormcontrol_type,
+                                level:             @level }
+      create if instantiate
+    end
+
+    def config_stormcontrol
+      stormcontrol_type = @set_args[:stormcontrol_type]
+      config_set('evpn_stormcontrol', stormcontrol_type, @set_args)
+    end
+
+    def create
+      @set_args[:state] = ''
+      config_stormcontrol
+    end
+
+    def destroy
+      @set_args[:state] = 'no'
+      config_stormcontrol
+    end
+
+    # Create a hash of all stormcontrol instances
+    def self.stormcontrol
+      hash = {}
+      type_list = %w(broadcast multicast unicast)
+      type_list.each do |type|
+        level = config_get('evpn_stormcontrol', type)
+        hash[type] = EvpnStormcontrol.new(type, level, false) if level
+      end
+      hash
+    end
+
+    def level
+      config_get('evpn_stormcontrol', @get_args[:stormcontrol_type])
+    end
+
+    def level=(level)
+      err_msg = "level must be either a 'String' or an" \
+                " 'Integer' object"
+      fail ArgumentError, err_msg unless level.is_a?(Integer) ||
+                                         level.is_a?(String)
+      @level = level.to_i
+      @set_args[:level] = @level
+      @set_args[:state] = ''
+      config_stormcontrol
+    end
+  end
+end
diff --git a/lib/cisco_node_utils/feature.rb b/lib/cisco_node_utils/feature.rb
index 09976722..575b90af 100644
--- a/lib/cisco_node_utils/feature.rb
+++ b/lib/cisco_node_utils/feature.rb
@@ -160,6 +160,25 @@ def self.lacp_enabled?
       return false
     end
 
+    # ---------------------------
+    def self.ngmvpn_enable
+      return if ngmvpn_enabled?
+      config_set('feature', 'ngmvpn', state: '')
+    end
+
+    def self.ngmvpn_enabled?
+      config_get('feature', 'ngmvpn')
+    rescue Cisco::CliError => e
+      # cmd will syntax reject when feature is not enabled.
+      raise unless e.clierror =~ /Syntax error/
+      return false
+    end
+
+    def self.ngmvpn_disable
+      return unless ngmvpn_enabled?
+      config_set('feature', 'ngmvpn', state: 'no')
+    end
+
     # ---------------------------
     def self.nv_overlay_enable
       # Note: vdc platforms restrict this feature to F3 or newer linecards
diff --git a/lib/cisco_node_utils/interface.rb b/lib/cisco_node_utils/interface.rb
index 954d8c2e..a25d8e1a 100644
--- a/lib/cisco_node_utils/interface.rb
+++ b/lib/cisco_node_utils/interface.rb
@@ -1227,8 +1227,9 @@ def stp_port_type=(val)
       if val
         state = ''
       else
+        return unless stp_port_type
         state = 'no'
-        val = ''
+        val = stp_port_type
       end
       config_set('interface', 'stp_port_type', name: @name,
                  state: state, type: val)
diff --git a/lib/cisco_node_utils/interface_evpn_multisite.rb b/lib/cisco_node_utils/interface_evpn_multisite.rb
new file mode 100644
index 00000000..2182541b
--- /dev/null
+++ b/lib/cisco_node_utils/interface_evpn_multisite.rb
@@ -0,0 +1,63 @@
+# October 2017, Rahul Shenoy
+#
+# Copyright (c) 2017 Cisco and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative 'node_util'
+
+module Cisco
+  # node_utils class for interface_evpn_multisite
+  class InterfaceEvpnMultisite < NodeUtil
+    attr_reader :interface, :tracking
+
+    def initialize(interface)
+      fail TypeError unless interface.is_a?(String)
+      @interface = interface.downcase
+      @get_args = @set_args = { interface: @interface }
+    end
+
+    def self.interfaces
+      hash = {}
+      intf_list = config_get('interface_evpn_multisite', 'all_interfaces')
+      return hash if intf_list.nil?
+
+      intf_list.each do |id|
+        id = id.downcase
+        intf = InterfaceEvpnMultisite.new(id)
+        hash[id] = intf if intf.tracking
+      end
+      hash
+    end
+
+    def enable(tracking)
+      @set_args[:tracking] = tracking
+      @set_args[:state] = ''
+      config_set('interface_evpn_multisite', 'evpn_multisite', @set_args)
+    end
+
+    def disable(tracking='dci-tracking')
+      @set_args[:tracking] = tracking
+      @set_args[:state] = 'no'
+      config_set('interface_evpn_multisite', 'evpn_multisite', @set_args)
+    end
+
+    def tracking
+      config_get('interface_evpn_multisite', 'evpn_multisite', @get_args)
+    end
+
+    def tracking=(tracking)
+      enable(tracking)
+    end
+  end # class
+end # module
diff --git a/lib/cisco_node_utils/ip_multicast.rb b/lib/cisco_node_utils/ip_multicast.rb
new file mode 100644
index 00000000..56e5f8db
--- /dev/null
+++ b/lib/cisco_node_utils/ip_multicast.rb
@@ -0,0 +1,86 @@
+# January 2018, Rahul Shenoy
+#
+# Copyright (c) 2018 Cisco and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative 'cisco_cmn_utils'
+require_relative 'node_util'
+require_relative 'feature'
+
+module Cisco
+  # node_utils class for evpn_multisite
+  class IpMulticast < NodeUtil
+    def initialize(instantiate=true)
+      @get_args = @set_args = {}
+      enable_features if instantiate
+    end
+
+    def destroy
+      @set_args[:state] = 'no'
+      config_set('ip_multicast', 'overlay_distributed_dr', @set_args)
+      config_set('ip_multicast', 'overlay_spt_only', @set_args)
+      Feature.ngmvpn_disable
+    end
+
+    def enable_features
+      Feature.nv_overlay_enable
+      Feature.nv_overlay_evpn_enable
+      Feature.ngmvpn_enable
+    end
+
+    def ip_multicast
+      Feature.ngmvpn_enabled?
+    end
+
+    def overlay_distributed_dr
+      config_get('ip_multicast', 'overlay_distributed_dr')
+    end
+
+    def overlay_distributed_dr=(bool)
+      fail TypeError unless [true, false].include?(bool)
+      @set_args[:state] = bool ? '' : 'no'
+      if @set_args[:state] == 'no'
+        unless overlay_distributed_dr == default_overlay_distributed_dr
+          config_set('ip_multicast', 'overlay_distributed_dr', @set_args)
+        end
+      else
+        config_set('ip_multicast', 'overlay_distributed_dr', @set_args)
+      end
+    end
+
+    def default_overlay_distributed_dr
+      config_get_default('ip_multicast', 'overlay_distributed_dr')
+    end
+
+    def overlay_spt_only
+      config_get('ip_multicast', 'overlay_spt_only')
+    end
+
+    def overlay_spt_only=(bool)
+      fail TypeError unless [true, false].include?(bool)
+      @set_args[:state] = bool ? '' : 'no'
+      if @set_args[:state] == 'no'
+        unless overlay_spt_only == default_overlay_spt_only
+          config_set('ip_multicast', 'overlay_spt_only', @set_args)
+        end
+      else
+        config_set('ip_multicast', 'overlay_spt_only', @set_args)
+      end
+    end
+
+    def default_overlay_spt_only
+      config_get_default('ip_multicast', 'overlay_spt_only')
+    end
+  end
+end
diff --git a/lib/cisco_node_utils/version.rb b/lib/cisco_node_utils/version.rb
index 0b08f418..5d761ab4 100644
--- a/lib/cisco_node_utils/version.rb
+++ b/lib/cisco_node_utils/version.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2017 Cisco and/or its affiliates.
+# Copyright (c) 2015-2018 Cisco and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 
 # Container module for version number only.
 module CiscoNodeUtils
-  VERSION = '1.8.0'
+  VERSION = '1.9.0'
   gem_version = Gem::Version.new(Gem::VERSION)
   min_gem_version = Gem::Version.new('2.1.0')
   fail 'Required rubygems version >= 2.1.0' if gem_version < min_gem_version
diff --git a/lib/cisco_node_utils/vrf_af.rb b/lib/cisco_node_utils/vrf_af.rb
index 2a46d4c9..2817ad69 100644
--- a/lib/cisco_node_utils/vrf_af.rb
+++ b/lib/cisco_node_utils/vrf_af.rb
@@ -75,16 +75,20 @@ def set_args_keys(hash={}) # rubocop:disable Style/AccessorMethodName
       @set_args = @get_args.merge!(hash) unless hash.empty?
     end
 
-    def route_target_feature_enable(require_nv_overlay=nil)
+    def route_target_feature_enable(require_nv_overlay=nil, require_ngmvpn=nil)
       return unless platform == :nexus
 
       # All NX route-target properties require feature bgp
       Feature.bgp_enable
 
       # Some platforms/versions also require nv overlay for some properties
-      return unless require_nv_overlay
-      Feature.nv_overlay_enable if Feature.nv_overlay_supported?
-      Feature.nv_overlay_evpn_enable if Feature.nv_overlay_evpn_supported?
+      if require_nv_overlay
+        Feature.nv_overlay_enable if Feature.nv_overlay_supported?
+        Feature.nv_overlay_evpn_enable if Feature.nv_overlay_evpn_supported?
+      end
+
+      # ngmvpn feature is required for 'mvpn' enablement
+      Feature.ngmvpn_enable if require_ngmvpn
     end
 
     ########################################################
@@ -163,6 +167,21 @@ def default_route_target_both_auto_evpn
       config_get_default('vrf_af', 'route_target_both_auto_evpn')
     end
 
+    # --------------------------
+    def route_target_both_auto_mvpn
+      config_get('vrf_af', 'route_target_both_auto_mvpn', @get_args)
+    end
+
+    def route_target_both_auto_mvpn=(state)
+      route_target_feature_enable(nil, :require_ngmvpn)
+      set_args_keys(state: (state ? '' : 'no'))
+      config_set('vrf_af', 'route_target_both_auto_mvpn', @set_args)
+    end
+
+    def default_route_target_both_auto_mvpn
+      config_get_default('vrf_af', 'route_target_both_auto_mvpn')
+    end
+
     # --------------------------
     def route_target_export
       cmds = config_get('vrf_af', 'route_target_export', @get_args)
@@ -194,6 +213,22 @@ def default_route_target_export_evpn
       config_get_default('vrf_af', 'route_target_export_evpn')
     end
 
+    # --------------------------
+    def route_target_export_mvpn
+      cmds = config_get('vrf_af', 'route_target_export_mvpn', @get_args)
+      cmds.nil? ? nil : cmds.sort
+    end
+
+    def route_target_export_mvpn=(should)
+      route_target_feature_enable(nil, :require_ngmvpn)
+      route_target_delta(should, route_target_export_mvpn,
+                         'route_target_export_mvpn')
+    end
+
+    def default_route_target_export_mvpn
+      config_get_default('vrf_af', 'route_target_export_mvpn')
+    end
+
     # --------------------------
     def route_target_export_stitching
       cmds = config_get('vrf_af', 'route_target_export_stitching', @get_args)
@@ -226,12 +261,12 @@ def default_route_target_import
 
     # --------------------------
     def route_target_import_evpn
-      route_target_feature_enable(:require_nv_overlay)
       cmds = config_get('vrf_af', 'route_target_import_evpn', @get_args)
       cmds.nil? ? nil : cmds.sort
     end
 
     def route_target_import_evpn=(should)
+      route_target_feature_enable(:require_nv_overlay)
       route_target_delta(should, route_target_import_evpn,
                          'route_target_import_evpn')
     end
@@ -240,6 +275,22 @@ def default_route_target_import_evpn
       config_get_default('vrf_af', 'route_target_import_evpn')
     end
 
+    # --------------------------
+    def route_target_import_mvpn
+      cmds = config_get('vrf_af', 'route_target_import_mvpn', @get_args)
+      cmds.nil? ? nil : cmds.sort
+    end
+
+    def route_target_import_mvpn=(should)
+      route_target_feature_enable(nil, :require_ngmvpn)
+      route_target_delta(should, route_target_import_mvpn,
+                         'route_target_import_mvpn')
+    end
+
+    def default_route_target_import_mvpn
+      config_get_default('vrf_af', 'route_target_import_mvpn')
+    end
+
     # --------------------------
     def route_target_import_stitching
       cmds = config_get('vrf_af', 'route_target_import_stitching', @get_args)
diff --git a/lib/cisco_node_utils/vxlan_vtep.rb b/lib/cisco_node_utils/vxlan_vtep.rb
index e5a9ba5e..0beb61c7 100644
--- a/lib/cisco_node_utils/vxlan_vtep.rb
+++ b/lib/cisco_node_utils/vxlan_vtep.rb
@@ -173,5 +173,29 @@ def shutdown=(bool)
     def default_shutdown
       config_get_default('vxlan_vtep', 'shutdown')
     end
+
+    def multisite_border_gateway_interface
+      config_get('vxlan_vtep', 'multisite_bg_intf', name: @name)
+    end
+
+    def multisite_border_gateway_interface=(val)
+      set_args = { name: @name }
+      set_args[:state] = val.empty? ? 'no' : ''
+      set_args[:lpbk_intf] = val.empty? ? 'loopback0' : val
+      if set_args[:state] == 'no'
+        # 'no multisite border-gateway' doesn't work without interface
+        # defaulting to 'loopback0' still clears any configuration
+        intf = multisite_border_gateway_interface
+        unless intf == default_multisite_border_gateway_interface
+          config_set('vxlan_vtep', 'multisite_bg_intf', set_args)
+        end
+      else
+        config_set('vxlan_vtep', 'multisite_bg_intf', set_args)
+      end
+    end
+
+    def default_multisite_border_gateway_interface
+      config_get_default('vxlan_vtep', 'multisite_bg_intf')
+    end
   end  # Class
 end    # Module
diff --git a/lib/cisco_node_utils/vxlan_vtep_vni.rb b/lib/cisco_node_utils/vxlan_vtep_vni.rb
index 8901defa..ace6784b 100644
--- a/lib/cisco_node_utils/vxlan_vtep_vni.rb
+++ b/lib/cisco_node_utils/vxlan_vtep_vni.rb
@@ -262,5 +262,26 @@ def suppress_uuc=(state)
     def default_suppress_uuc
       config_get_default('vxlan_vtep_vni', 'suppress_uuc')
     end
+
+    def multisite_ingress_replication
+      config_get('vxlan_vtep_vni', 'multisite_ingress_replication', @get_args)
+    end
+
+    def multisite_ingress_replication=(state)
+      @set_args[:state] = state ? '' : 'no'
+      if @set_args[:state] == 'no'
+        unless multisite_ingress_replication ==
+               default_multisite_ingress_replication
+          config_set('vxlan_vtep_vni', 'multisite_ingress_replication',
+                     @set_args)
+        end
+      else
+        config_set('vxlan_vtep_vni', 'multisite_ingress_replication', @set_args)
+      end
+    end
+
+    def default_multisite_ingress_replication
+      config_get_default('vxlan_vtep_vni', 'multisite_ingress_replication')
+    end
   end
 end
diff --git a/tests/ciscotest.rb b/tests/ciscotest.rb
index 3d83c7ca..a3225f39 100644
--- a/tests/ciscotest.rb
+++ b/tests/ciscotest.rb
@@ -83,9 +83,10 @@ def self.node
       @@node.cache_auto = true
       # Record the platform we're running on
       puts "\nNode under test:"
-      puts "  - name  - #{@@node.host_name}"
-      puts "  - type  - #{@@node.product_id}"
-      puts "  - image - #{@@node.system}\n\n"
+      puts "  - name    - #{@@node.host_name}"
+      puts "  - type    - #{@@node.product_id}"
+      puts "  - image   - #{@@node.system}"
+      puts "  - version - #{@@node.os_version}\n\n"
     end
     @@node
   rescue Cisco::AuthenticationFailed
@@ -226,6 +227,38 @@ def skip_legacy_defect?(pattern, msg)
     skip(msg) if Utils.image_version?(Regexp.new(pattern))
   end
 
+  def step_unless_legacy_defect(pattern, msg)
+    if pattern.is_a?(String)
+      pattern = [pattern]
+    elsif !pattern.is_a?(Array)
+      fail 'Argument: pattern must be a String or Array object'
+    end
+    pattern.each do |pat|
+      if Utils.image_version?(Regexp.new(pat))
+        puts "Skip Step: Defect in legacy image: [#{msg}]"
+        return false
+      end
+    end
+  end
+
+  def step_unless_version_unsupported(pattern)
+    if pattern.is_a?(String)
+      pattern = [pattern]
+    elsif !pattern.is_a?(Array)
+      fail 'Argument: pattern must be a String or Array object'
+    end
+    pattern.each do |pat|
+      if Utils.image_version?(Regexp.new(pat))
+        puts "Skip Step: Feature not supported in this image version: [#{Platform.image_version}]"
+        return false
+      end
+    end
+  end
+
+  def virtual_platform?
+    node.product_id[/N9K-NXOSV|N9K-9000v/] ? true : false
+  end
+
   def interfaces
     unless @@interfaces
       # Build the platform_info, used for interface lookup
diff --git a/tests/tacacs_server.yaml.example b/tests/tacacs_server.yaml.example
index bb953764..5e6d3353 100644
--- a/tests/tacacs_server.yaml.example
+++ b/tests/tacacs_server.yaml.example
@@ -1,6 +1,6 @@
 # Tacacs server configuration for test_aaa_authorization_service.rb
 # Tacacs server must be set up with external access for test to run
-host: '10.122.197.197'
+host: '10.122.197.184'
 key:  'testing123'
 vrf:  'management'
 intf: 'mgmt0'
diff --git a/tests/test_bgp_af.rb b/tests/test_bgp_af.rb
index 162809a8..120167cc 100644
--- a/tests/test_bgp_af.rb
+++ b/tests/test_bgp_af.rb
@@ -170,7 +170,7 @@ def check_test_exceptions(test_, os_, vrf_, af_)
       # triggers a version check below.
       if expect == :runtime
         case Platform.image_version
-        when /8.0|8.1|8.2|F3.2/
+        when /8.0|8.1|8.2|8.3|F3.2/
           expect = :success
           expect = :runtime if test == :additional_paths_receive && Platform.image_version[/8.0|8.1/]
         when /I5.2|I5.3|I6/
diff --git a/tests/test_bgp_neighbor.rb b/tests/test_bgp_neighbor.rb
index f89d7c58..7ea260e7 100644
--- a/tests/test_bgp_neighbor.rb
+++ b/tests/test_bgp_neighbor.rb
@@ -578,4 +578,19 @@ def test_update_source
       neighbor.destroy
     end
   end
+
+  def test_peer_type
+    skip("#{node.product_id} doesn't support this feature") unless
+      node.product_id[/N9K.*EX/]
+    %w(default test_vrf).each do |vrf|
+      neighbor = RouterBgpNeighbor.new(ASN, vrf, ADDR)
+      check = ['fabric-border-leaf', 'fabric-external',
+               neighbor.default_peer_type]
+      check.each do |val|
+        neighbor.peer_type = val
+        assert_equal(val, neighbor.peer_type)
+      end
+      neighbor.destroy
+    end
+  end
 end
diff --git a/tests/test_bgp_neighbor_af.rb b/tests/test_bgp_neighbor_af.rb
index 2e1f9e3c..3c4ef610 100644
--- a/tests/test_bgp_neighbor_af.rb
+++ b/tests/test_bgp_neighbor_af.rb
@@ -751,4 +751,31 @@ def weight(af, dbg)
     assert_equal(af.default_weight, af.weight,
                  "Test 3. #{dbg} Failed to remove weight")
   end
+
+  def test_rewrite_evpn_rt_asn
+    skip("#{node.product_id} doesn't support this feature") unless
+      node.product_id[/N9K.*EX/]
+    af_args = @@matrix[:evpn]
+    # clean_af needs true since rewrite_rt_asn is ebgp only
+    af, dbg = clean_af(af_args, true)
+    rewrite_evpn_rt_asn(af, dbg)
+  end
+
+  def rewrite_evpn_rt_asn(af, dbg)
+    # eBGP only
+    af.rewrite_evpn_rt_asn = true
+    assert(af.rewrite_evpn_rt_asn,
+           "Test 1. #{dbg} Did not set true")
+
+    af.rewrite_evpn_rt_asn = false
+    refute(af.rewrite_evpn_rt_asn,
+           "Test 2. #{dbg} Did not set false")
+
+    af.rewrite_evpn_rt_asn = true
+
+    def_val = af.default_rewrite_evpn_rt_asn
+    af.rewrite_evpn_rt_asn = def_val
+    assert_equal(def_val, af.rewrite_evpn_rt_asn,
+                 "Test 3. #{dbg} Did not set to default")
+  end
 end
diff --git a/tests/test_evpn_multicast.rb b/tests/test_evpn_multicast.rb
new file mode 100644
index 00000000..a456a00f
--- /dev/null
+++ b/tests/test_evpn_multicast.rb
@@ -0,0 +1,65 @@
+# Evpn Multicast Unit Tests
+#
+# Rahul Shenoy, January, 2018
+#
+# Copyright (c) 2018 Cisco and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative 'ciscotest'
+require_relative '../lib/cisco_node_utils/evpn_multicast'
+require_relative '../lib/cisco_node_utils/feature'
+
+# TestEvpnMulticast - Minitest for EvpnMulticast class
+class TestEvpnMulticast < CiscoTestCase
+  @skip_unless_supported = 'evpn_multicast'
+
+  def setup
+    # Disable feature ngmvpn before each test to
+    # ensure we are starting with a clean slate for each test.
+    super
+    skip_incompat_version?('feature', 'ngmvpn')
+    config_no_warn('no feature ngmvpn')
+    config_no_warn('no advertise evpn multicast')
+  end
+
+  def teardown
+    # disable feature ngmvpn and advertise evpn multicast
+    # after each test
+    config_no_warn('no feature ngmvpn')
+    config_no_warn('no advertise evpn multicast')
+    super
+  end
+
+  def test_create_and_destroy
+    mc = EvpnMulticast.new
+    assert_equal('advertise evpn multicast', mc.multicast,
+                 'Error: failed to enable evpn multicast')
+    assert(Feature.ngmvpn_enabled?,
+           'Error: failed to enable feature ngmvpn')
+    mc.destroy
+    assert_equal('', mc.multicast,
+                 'Error: failed to disable evpn multicast')
+  end
+
+  def test_multicast
+    mc = EvpnMulticast.new
+    mc.multicast = false
+    assert_equal('', mc.multicast,
+                 'Error: failed to disable evpn multicast')
+    mc.multicast = true
+    assert_equal('advertise evpn multicast', mc.multicast,
+                 'Error: failed to enable evpn multicast')
+    mc.destroy
+  end
+end
diff --git a/tests/test_evpn_multisite.rb b/tests/test_evpn_multisite.rb
new file mode 100644
index 00000000..a2ca5bdd
--- /dev/null
+++ b/tests/test_evpn_multisite.rb
@@ -0,0 +1,70 @@
+# Evpn Multisite Unit Tests
+#
+# Rahul Shenoy, October, 2017
+#
+# Copyright (c) 2017 Cisco and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative 'ciscotest'
+require_relative '../lib/cisco_node_utils/evpn_multisite'
+
+# TestEvpnMultisite - Minitest for EvpnMultisite class
+class TestEvpnMultisite < CiscoTestCase
+  @skip_unless_supported = 'evpn_multisite'
+
+  def setup
+    # Disable feature nv overlay before each test to
+    # ensure we are starting with a clean slate for each test.
+    super
+    skip("#{node.product_id} doesn't support this feature") unless
+      node.product_id[/N9K.*EX/]
+    config('no feature nv overlay')
+  end
+
+  def test_create_and_destroy
+    ms = EvpnMultisite.new(100)
+    ms_id = ms.multisite
+    assert_equal('100', ms_id,
+                 'Error: failed to create multisite border-gateway 100')
+    ms.destroy
+    ms_id = ms.multisite
+    assert_nil(ms_id, 'Error: failed to destroy multisite border-gateway 100')
+  end
+
+  def test_delay_restore
+    ms = EvpnMultisite.new(100)
+    ms.delay_restore = 31
+    assert_equal('31', ms.delay_restore,
+                 'multisite border-gateway delay_restore should be 31')
+    ms.delay_restore = 1000
+    assert_equal('1000', ms.delay_restore,
+                 'multisite border-gateway delay_restore should be 1000')
+    ms.destroy
+  end
+
+  def test_update_multisiteid
+    ms = EvpnMultisite.new(100)
+    ms.delay_restore = 50
+    assert_equal('100', ms.multisite,
+                 'Error: failed to create multisite border-gateway 100')
+    assert_equal('50', ms.delay_restore,
+                 'multisite border-gateway delay_restore should be 50')
+    ms.multisite = 200
+    assert_equal('200', ms.multisite,
+                 'Error: failed to create multisite border-gateway 200')
+    assert_equal('50', ms.delay_restore,
+                 'multisite border-gateway delay_restore should be 50')
+    ms.destroy
+  end
+end
diff --git a/tests/test_evpn_stormcontrol.rb b/tests/test_evpn_stormcontrol.rb
new file mode 100644
index 00000000..9c39fb18
--- /dev/null
+++ b/tests/test_evpn_stormcontrol.rb
@@ -0,0 +1,56 @@
+# Evpn Stormcontrol Unit Tests
+#
+# Rahul Shenoy, October, 2017
+#
+# Copyright (c) 2017 Cisco and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative 'ciscotest'
+require_relative '../lib/cisco_node_utils/evpn_stormcontrol'
+
+# TestEvpnStormcontrol - Minitest for EvpnStormcontrol class
+class TestEvpnStormcontrol < CiscoTestCase
+  @skip_unless_supported = 'evpn_stormcontrol'
+
+  def setup
+    # Ensure we are starting with a clean slate for each test.
+    super
+    skip("#{node.product_id} doesn't support this feature") unless
+      node.product_id[/N9K.*EX/]
+    config('no evpn storm-control broadcast level 50')
+    config('no evpn storm-control multicast level 50')
+    config('no evpn storm-control unicast level 50')
+  end
+
+  def test_create_and_destroy
+    sc = EvpnStormcontrol.new('broadcast', 50)
+    sc_level = sc.level
+    assert_equal('50', sc_level,
+                 'Error: failed to configure evpn storm-control broadcast ' \
+                 'level 50')
+    sc.destroy
+    sc_level = sc.level
+    assert_nil(sc_level, 'Error: failed to destroy storm-control config')
+  end
+
+  def test_update_level
+    sc = EvpnStormcontrol.new('multicast', 50)
+    assert_equal('50', sc.level,
+                 'Error: multicast storm-control level should be 50')
+    sc.level = 51
+    assert_equal('51', sc.level,
+                 'Error: failed to create multisite border-gateway 200')
+    sc.destroy
+  end
+end
diff --git a/tests/test_feature.rb b/tests/test_feature.rb
index a4f8905f..14026b94 100755
--- a/tests/test_feature.rb
+++ b/tests/test_feature.rb
@@ -31,7 +31,6 @@ def teardown
      'no feature bgp',
      'no feature dhcp',
      'no feature fabric forwarding',
-     'no feature-set fex',
      'no feature hsrp',
      'no feature itd',
      'no feature nv overlay',
@@ -42,6 +41,11 @@ def teardown
      'no feature vn-segment-vlan-based',
      'no feature vni',
      'no feature vtp'].each { |f| config_no_warn(f) }
+
+    # Special case for 'no feature-set fex'
+    # Some image versions prompt y/n to remove the feature-set.
+    config_no_warn('terminal dont-ask')
+    config_no_warn('no feature-set fex')
   end
 
   ###########
@@ -226,6 +230,7 @@ def test_feature_set_fex
 
     # clean
     if Feature.fex_installed?
+      config_no_warn('terminal dont-ask')
       config_no_warn("no #{fs}")
       config_no_warn("no install #{fs}")
     end
diff --git a/tests/test_interface_evpn_multisite.rb b/tests/test_interface_evpn_multisite.rb
new file mode 100644
index 00000000..409f6c97
--- /dev/null
+++ b/tests/test_interface_evpn_multisite.rb
@@ -0,0 +1,59 @@
+# Interface Evpn Multisite Unit Tests
+#
+# Rahul Shenoy, October, 2017
+#
+# Copyright (c) 2017 Cisco and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative 'ciscotest'
+require_relative '../lib/cisco_node_utils/interface_evpn_multisite'
+require_relative '../lib/cisco_node_utils/evpn_multisite'
+
+# TestInterfaceEvpnMultisite - Minitest for InterfaceEvpnMultisite class
+class TestInterfaceEvpnMultisite < CiscoTestCase
+  @skip_unless_supported = 'interface_evpn_multisite'
+
+  def setup
+    # ensure we are starting with a clean slate for each test.
+    super
+    skip("#{node.product_id} doesn't support this feature") unless
+      node.product_id[/N9K.*EX/]
+    interface_ethernet_default(interfaces[0])
+  end
+
+  def interface_ethernet_default(intf)
+    config("default interface #{intf}")
+  end
+
+  def test_enable_disable
+    interface = interfaces[0]
+    intf_ms = InterfaceEvpnMultisite.new(interface)
+    ms = EvpnMultisite.new(100)
+    intf_ms.enable('dci-tracking')
+    assert_equal('dci-tracking', intf_ms.tracking)
+    intf_ms.disable('dci-tracking')
+    assert_nil(intf_ms.tracking)
+    ms.destroy
+  end
+
+  def test_enable_with_no_multisite_bordergateway
+    interface = interfaces[0]
+    intf_ms = InterfaceEvpnMultisite.new(interface)
+    ms = EvpnMultisite.new(100)
+    ms.destroy
+    assert_raises(CliError, 'Invalid command') do
+      intf_ms.enable('dci-tracking')
+    end
+  end
+end
diff --git a/tests/test_ip_multicast.rb b/tests/test_ip_multicast.rb
new file mode 100644
index 00000000..4d3391b6
--- /dev/null
+++ b/tests/test_ip_multicast.rb
@@ -0,0 +1,69 @@
+# IP Multicast Unit Tests
+#
+# Rahul Shenoy, January, 2018
+#
+# Copyright (c) 2018 Cisco and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative 'ciscotest'
+require_relative '../lib/cisco_node_utils/ip_multicast'
+require_relative '../lib/cisco_node_utils/feature'
+
+# TestIpMulticast - Minitest for IpMulticast class
+class TestIpMulticast < CiscoTestCase
+  @skip_unless_supported = 'ip_multicast'
+
+  def setup
+    # Disable feature ngmvpn before each test to
+    # ensure we are starting with a clean slate for each test.
+    super
+    skip_incompat_version?('feature', 'ngmvpn')
+    config_no_warn('no feature ngmvpn')
+  end
+
+  def teardown
+    # Disable feature ngmvpn after each test
+    config_no_warn('no feature ngmvpn')
+    super
+  end
+
+  def test_ip_multicast
+    ipm = IpMulticast.new
+    opts = %w(overlay_distributed_dr overlay_spt_only)
+
+    # test defaults
+    opts.each do |opt|
+      have = ipm.send("#{opt}")
+      should = ipm.send("default_#{opt}")
+      assert_equal(have, should, "#{opt} doesn't match the default")
+    end
+
+    # test property set
+    opts.each do |opt|
+      ipm.send("#{opt}=", true)
+      should = 'ip multicast ' + opt.tr('_', '-')
+      assert_equal(ipm.send("#{opt}"), should, "#{opt} was not set")
+    end
+
+    # unset property
+    opts.each do |opt|
+      ipm.send("#{opt}=", false)
+      should = false
+      assert_equal(ipm.send("#{opt}"), should, "#{opt} was not unset")
+      assert_equal(ipm.send("#{opt}"), ipm.send("default_#{opt}"), "#{opt} doesn't match default")
+    end
+
+    ipm.destroy
+  end
+end
diff --git a/tests/test_node_ext.rb b/tests/test_node_ext.rb
index 7357c471..590a411e 100644
--- a/tests/test_node_ext.rb
+++ b/tests/test_node_ext.rb
@@ -333,7 +333,7 @@ def test_get_last_reset_time
     if validate_property_excluded?('show_version', 'last_reset_time')
       assert_nil(node.last_reset_time)
     else
-      refute_nil(node.last_reset_time)
+      refute_nil(node.last_reset_time) unless virtual_platform?
     end
   end
 
@@ -345,7 +345,8 @@ def test_get_last_reset_reason
     assert_output_check(command: 'show version',
                         pattern: /.*\nLast reset.*\n\n?  Reason: (.*)\n/,
                         check:   node.last_reset_reason,
-                        msg:     'Error, Last reset reason does not match')
+                        msg:     'Error, Last reset reason does not match') unless
+      virtual_platform?
   end
 
   def test_get_system_cpu_utilization
diff --git a/tests/test_radius_global.rb b/tests/test_radius_global.rb
index c9bba003..dca2abe8 100644
--- a/tests/test_radius_global.rb
+++ b/tests/test_radius_global.rb
@@ -71,11 +71,13 @@ def test_radius_global
       assert_match(/#{key}/, global.key)
       assert_match(/#{key}/, Cisco::RadiusGlobal.radius_global[id].key)
       assert_equal(7, global.key_format)
-      # Change to type 6
-      key = 'JDYkqyIFWeBvzpljSfWmRZrmRSRE8'
-      global.key_set(key, 6)
-      assert_match(/#{key}/, global.key)
-      assert_equal(6, global.key_format)
+      unless Platform.image_version[/I2|I4/] # legacy defect CSCvb57180
+        # Change to type 6
+        key = 'JDYkqyIFWeBvzpljSfWmRZrmRSRE8'
+        global.key_set(key, 6)
+        assert_match(/#{key}/, global.key)
+        assert_equal(6, global.key_format)
+      end
     elsif platform == :ios_xr
       global.key_set('QsEfThUkO', nil)
       assert(!global.key.nil?)
diff --git a/tests/test_router_ospf_vrf.rb b/tests/test_router_ospf_vrf.rb
index e1d36991..60c646e4 100644
--- a/tests/test_router_ospf_vrf.rb
+++ b/tests/test_router_ospf_vrf.rb
@@ -300,6 +300,8 @@ def test_default_metric
     assert_equal(metric, vrf.default_metric,
                  "Error: #{vrf.name} vrf, default-metric get value mismatch")
 
+    skip_versions = ['7.0.3.I7.3']
+    return unless step_unless_legacy_defect(skip_versions, 'CSCvi74876: Cannot remove default metric')
     vrf.default_metric = vrf.default_default_metric
     refute_match_vrf_line(vrf.parent.name, vrf.name, pattern)
     vrf.parent.destroy
diff --git a/tests/test_stp_global.rb b/tests/test_stp_global.rb
index e09db678..b774fdd6 100644
--- a/tests/test_stp_global.rb
+++ b/tests/test_stp_global.rb
@@ -492,6 +492,13 @@ def test_intf_stp_port_type_change
     @intf.stp_port_type = @intf.default_stp_port_type
     assert_equal(@intf.default_stp_port_type,
                  @intf.stp_port_type)
+    # Set default again and check. This is needed since
+    # we query the stp_port_type to use with the 'no'
+    # form of the command and false is not a valid
+    # stp_port_type
+    @intf.stp_port_type = @intf.default_stp_port_type
+    assert_equal(@intf.default_stp_port_type,
+                 @intf.stp_port_type)
   end
 
   def test_intf_stp_mst_cost_change
diff --git a/tests/test_tacacs_global.rb b/tests/test_tacacs_global.rb
index 429f42a2..a232e7d5 100644
--- a/tests/test_tacacs_global.rb
+++ b/tests/test_tacacs_global.rb
@@ -77,13 +77,16 @@ def test_tacacs_global
     assert_equal(7, global.key_format)
     assert_equal('"WAWY_NZB"', global.key)
 
-    # second key change - modify key to type6
-    key_format = 6
-    # Must use a valid type6 password: CSCvb36266
-    key = 'JDYkqyIFWeBvzpljSfWmRZrmRSRE8'
-    global.encryption_key_set(key_format, key)
-    assert_equal(key_format, global.key_format)
-    assert_equal("\"#{key}\"", global.key)
+    skip_versions = ['7.0.3.(I2|I3)', '7.0.3.I4.[1-7]']
+    if step_unless_legacy_defect(skip_versions, 'CSCvh72911: Cannot configure tacacs-server key 6')
+      # second key change - modify key to type6
+      key_format = 6
+      # Must use a valid type6 password: CSCvb36266
+      key = 'JDYkqyIFWeBvzpljSfWmRZrmRSRE8'
+      global.encryption_key_set(key_format, key)
+      assert_equal(key_format, global.key_format)
+      assert_equal("\"#{key}\"", global.key)
+    end
 
     # Remove global key
     global.encryption_key_set('', '')
diff --git a/tests/test_vrf_af.rb b/tests/test_vrf_af.rb
index 4a8f1b31..12c22341 100755
--- a/tests/test_vrf_af.rb
+++ b/tests/test_vrf_af.rb
@@ -116,14 +116,21 @@ def test_route_target
     vdc_limit_f3_no_intf_needed(:clear)
   end
 
-  def route_target(af)
+  def route_target(af, _test_mvpn=false)
     # Common tester for route-target properties. Tests evpn and non-evpn.
     #   route_target_both_auto
     #   route_target_both_auto_evpn
+    #   route_target_both_auto_mvpn
     #   route_target_export
     #   route_target_export_evpn
+    #   route_target_export_mvpn
     #   route_target_import
     #   route_target_import_evpn
+    #   route_target_import_mvpn
+
+    # mvpn tests are only supported on 7.0.3.I7.1 and later
+    mvpn_skip_versions = ['7.0.3.(I2|I3|I4|I5|I6)']
+
     vrf = 'orange'
     v = VrfAF.new(vrf, af)
 
@@ -134,6 +141,11 @@ def route_target(af)
     refute(v.default_route_target_both_auto_evpn,
            'default value for route target both auto evpn should be false')
 
+    if step_unless_version_unsupported(mvpn_skip_versions)
+      refute(v.default_route_target_both_auto_mvpn,
+             'default value for route target both auto mvpn should be false')
+    end
+
     if validate_property_excluded?('vrf_af', 'route_target_both_auto')
       assert_raises(Cisco::UnsupportedError) { v.route_target_both_auto = true }
     else
@@ -160,6 +172,22 @@ def route_target(af)
              'v route-target both auto evpn should be disabled')
     end
 
+    if step_unless_version_unsupported(mvpn_skip_versions)
+      if validate_property_excluded?('vrf_af', 'route_target_both_auto_mvpn')
+        assert_raises(Cisco::UnsupportedError) do
+          v.route_target_both_auto_mvpn = true
+        end
+      else
+        v.route_target_both_auto_mvpn = true
+        assert(v.route_target_both_auto_mvpn, "vrf context #{vrf} af #{af}: "\
+               'v route-target both auto mvpn should be enabled')
+
+        v.route_target_both_auto_mvpn = false
+        refute(v.route_target_both_auto_mvpn, "vrf context #{vrf} af #{af}: "\
+               'v route-target both auto mvpn should be disabled')
+      end
+    end
+
     opts = [:import, :export]
 
     # Master list of communities to test against
@@ -185,6 +213,9 @@ def route_target(af)
   end
 
   def route_target_tester(v, af, opts, should, test_id)
+    # mvpn tests are only supported on 7.0.3.I7.1 and later
+    mvpn_skip_versions = ['7.0.3.(I2|I3|I4|I5|I6)']
+
     # First configure all four property types
     opts.each do |opt|
       # non-evpn
@@ -197,6 +228,16 @@ def route_target_tester(v, af, opts, should, test_id)
       else
         v.send("route_target_#{opt}_evpn=", should)
       end
+      # mvpn
+      if step_unless_version_unsupported(mvpn_skip_versions)
+        if validate_property_excluded?('vrf_af', "route_target_#{opt}_mvpn")
+          assert_raises(Cisco::UnsupportedError, "route_target_#{opt}_mvpn=") do
+            v.send("route_target_#{opt}_mvpn=", should)
+          end
+        else
+          v.send("route_target_#{opt}_mvpn=", should)
+        end
+      end
       # stitching
       if platform == :nexus
         assert_raises(Cisco::UnsupportedError,
@@ -222,6 +263,16 @@ def route_target_tester(v, af, opts, should, test_id)
         assert_equal(should, result,
                      "#{test_id} : #{af} : route_target_#{opt}_evpn")
       end
+      # mvpn
+      if step_unless_version_unsupported(mvpn_skip_versions)
+        result = v.send("route_target_#{opt}_mvpn")
+        if validate_property_excluded?('vrf_af', "route_target_#{opt}_mvpn")
+          assert_nil(result)
+        else
+          assert_equal(should, result,
+                       "#{test_id} : #{af} : route_target_#{opt}_mvpn")
+        end
+      end
       # stitching
       result = v.send("route_target_#{opt}_stitching")
       if platform == :nexus
diff --git a/tests/test_vxlan_vtep.rb b/tests/test_vxlan_vtep.rb
index 49712acc..a46a2757 100755
--- a/tests/test_vxlan_vtep.rb
+++ b/tests/test_vxlan_vtep.rb
@@ -16,6 +16,7 @@
 require_relative '../lib/cisco_node_utils/feature'
 require_relative '../lib/cisco_node_utils/vxlan_vtep'
 require_relative '../lib/cisco_node_utils/vdc'
+require_relative '../lib/cisco_node_utils/evpn_multisite'
 
 include Cisco
 
@@ -182,6 +183,28 @@ def test_source_interface
     assert_equal(val, vtep.source_interface)
   end
 
+  def test_multisite_bg_interface
+    skip("#{node.product_id} doesn't support this feature") unless
+      node.product_id[/N9K.*EX/]
+    vtep = VxlanVtep.new('nve1')
+
+    # Set multisite_bg_interface to non-default value
+    val = 'loopback55'
+    ms = EvpnMultisite.new(100)
+    vtep.multisite_border_gateway_interface = val
+    assert_equal(val, vtep.multisite_border_gateway_interface)
+
+    vtep.multisite_border_gateway_interface = vtep.default_multisite_border_gateway_interface
+    assert_equal(vtep.default_multisite_border_gateway_interface,
+                 vtep.multisite_border_gateway_interface)
+
+    # Should Error when no 'evpn multisite border-gateway' set
+    ms.destroy
+    assert_raises(Cisco::CliError) do
+      vtep.multisite_border_gateway_interface = val
+    end
+  end
+
   def test_source_interface_hold_down_time
     vtep = VxlanVtep.new('nve1')
     if validate_property_excluded?('vxlan_vtep', 'source_intf_hold_down_time')
diff --git a/tests/test_vxlan_vtep_vni.rb b/tests/test_vxlan_vtep_vni.rb
index 9415a882..4ec522fb 100644
--- a/tests/test_vxlan_vtep_vni.rb
+++ b/tests/test_vxlan_vtep_vni.rb
@@ -15,6 +15,7 @@
 require_relative 'ciscotest'
 require_relative '../lib/cisco_node_utils/vxlan_vtep'
 require_relative '../lib/cisco_node_utils/vxlan_vtep_vni'
+require_relative '../lib/cisco_node_utils/evpn_multisite'
 
 include Cisco
 
@@ -258,4 +259,34 @@ def test_suppress_uuc
     vni.suppress_uuc = vni.default_suppress_uuc
     refute(vni.suppress_uuc, 'suppress_uuc should be disabled')
   end
+
+  def test_multisite_ingress_replication
+    skip("#{node.product_id} doesn't support this feature") unless
+      node.product_id[/N9K.*EX/]
+
+    vni = VxlanVtepVni.new('nve1', '6000')
+    ms = EvpnMultisite.new(100)
+
+    # Test: Default
+    vni.multisite_ingress_replication =
+      vni.default_multisite_ingress_replication
+    refute(vni.multisite_ingress_replication,
+           'multisite ingress-replication should be disabled')
+
+    # Test: Enable multisite_ingress_replication
+    vni.multisite_ingress_replication = true
+    assert(vni.multisite_ingress_replication,
+           'multisite ingress-replication should be enabled')
+
+    # Test: Disable multisite_ingress_replication
+    vni.multisite_ingress_replication = false
+    refute(vni.multisite_ingress_replication,
+           'multisite ingress-replication should be disabled')
+
+    ms.destroy
+    # Test: enabling multisite ingress-replication without a multisite bg errors
+    assert_raises(Cisco::CliError) do
+      vni.multisite_ingress_replication = true
+    end
+  end
 end
diff --git a/tests/yum_package.yaml b/tests/yum_package.yaml
index 05aacfe8..1d674469 100644
--- a/tests/yum_package.yaml
+++ b/tests/yum_package.yaml
@@ -68,6 +68,16 @@
   name:     'nxos.sample-n9k_ALL'
   version:  '1.0.0-7.0.3.I7.1'
 
+7_0_3_I7_2_:
+  filename: 'nxos.sample-n9k_ALL-1.0.0-7.0.3.I7.2.lib32_n9000.rpm'
+  name:     'nxos.sample-n9k_ALL'
+  version:  '1.0.0-7.0.3.I7.2'
+
+7_0_3_I7_3_:
+  filename: 'nxos.sample-n9k_ALL-1.0.0-7.0.3.I7.3.lib32_n9000.rpm'
+  name:     'nxos.sample-n9k_ALL'
+  version:  '1.0.0-7.0.3.I7.3'
+
 7_0_3_F1_1_:
   filename: 'nxos.sample-n8k_EOR-1.0.0-7.0.3.F1.1.lib32_nxos.rpm'
   name:     'nxos.sample-n8k_EOR'