Fixed tests on test directory. All pass on mint.
Merge branch 'master' of github.com:AIFDR/inasafe