Put EventRouter in a separate file and amended specs accordingly. Added custom logging in both classes.