Unit test

Refactor FirewallListenerTest