AIFDR/inasafe — pull request #1031 by ismailsunni (2014-06-04 04:42:57+00:00)
Title: Fix tests

Merge since it's needed and small changes.