Add killswitch test
fix killswitch test