Remove the transition to speed up the process, add test click handler