Add disks/firewalls tests, fix bugs encountered