Almost done with policy switching
testing stuff
fixed test script
Merge branch 'policy_switch'
testing