firewall: cleanup tests + fix ec2