move the listeners
add RepeatedOnClicksListener with tests