Add addEvents test
Put helpers into private methods