Fixing firewall tests due to new year problems