Better test toggling