changed event listeners and tests