Update UT, fix toggleStatus logic