Retreived two event listeners and fixed tests