Refactored: Do not create objects and use firebase url
Test coverage for event handling