diff --git a/ansible/group_vars/sonic/vars b/ansible/group_vars/sonic/vars
index 8154122deb3..25345901c12 100644
--- a/ansible/group_vars/sonic/vars
+++ b/ansible/group_vars/sonic/vars
@@ -8,8 +8,6 @@ mellanox_hwskus: [ 'ACS-MSN2700' ]
 
 cavium_hwskus: [ "AS7512", "XP-SIM" ]
 
-sensor_hwskus: [ "ACS-MSN2700", "Force10-S6000" ]
-
 ## Note:
 ## Docker volumes should be list instead of dict. However, if we want to keep code DRY, we
 ## need to merge dictionaries, and convert them to list
diff --git a/ansible/roles/test/vars/testcases.yml b/ansible/roles/test/vars/testcases.yml
index efd25153b30..230efd1d628 100644
--- a/ansible/roles/test/vars/testcases.yml
+++ b/ansible/roles/test/vars/testcases.yml
@@ -43,7 +43,7 @@ testcases:
  
     decap:
       filename: decap.yml
-      topologies: [t1, t1-lag, t1-64-lag]
+      topologies: [t1, t1-lag, t1-64-lag, t0, t0-116]
       execvars:
           ptf_host: 
           testbed_type: 
@@ -77,7 +77,7 @@ testcases:
           testbed_type:
  
     fdb:
-      filename: bgp_fact.yml
+      filename: fdb.yml
       topologies: [t0, t0-64, t0-64-32, t0-116]
       execvars: 
           ptf_host: 
@@ -96,11 +96,11 @@ testcases:
     
     link_flap:
       filename: link_flap.yml
-      topologies: [t0, t0-64, t0-64-32,t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64]
+      topologies: [t0, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64]
     
     mem_check:
       filename: mem_check.yml
-      topologies: [t0, t0-64, t0-64-32,t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64]
+      topologies: [t0, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64]
     
     neighbour:
       filename: neighbour.yml
@@ -116,7 +116,7 @@ testcases:
      
     pfc_wd:
       filename: pfc_wd.yml
-      topologies: [t0, t0-64, t0-64-32,t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64]
+      topologies: [t0, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64]
 
     qos:
       filename: qos.yml
@@ -124,23 +124,23 @@ testcases:
     
     reboot:
       filename: reboot.yml
-      topologies: [t0, t0-64, t0-64-32,t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64]
+      topologies: [t0, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64]
 
     restart_swss:
       filename: run_config_cleanup.yml
       topologies: [t0, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64]
 
-    sensors_check:
+    sensors:
       filename: sensors_check.yml
-      topologies: [t0, t0-64, t0-64-32,t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64]
+      topologies: [t0, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64]
     
     snmp:
       filename: snmp.yml
-      topologies: [t0, t0-64, t0-64-32,t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64]
+      topologies: [t0, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64]
      
     syslog:
       filename: syslog.yml
-      topologies: [t0, t0-64, t0-64-32,t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64]
+      topologies: [t0, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64]
 
     vlan:
       filename: vlantb.yml