Fix #162 #163

I will add even more tests on the click events to get a higher code coverage