test changes and integration
Merge branch 'wire_cut_behavior' into bharath_dev_branch