Added Firewall Service update code. Started to tidy up unit tests as they were really messy and the amount of XML was very ugly.