Fixed failing tests
Merge branch 'CORE-1700' of github.com:frontlinesms/frontlinesms2 into CORE-1700