Add more tests on FirewallMap