Ticket_8: Add custom tag and tests
Ticket_8: Add tests