Click handler + extra tests