Toggle with mouse click; Updated tests