Fixing build warnings

* Removed an unused and unresolvable reference
* Updated DisasterController unit tests to not use an obsolete method (and fixed the new method to make the tests pass)