firewall: add horizon + fix unit tests