removed unecessary integration tests that should be moved to unit tests
Merge branch 'CORE-1104-fix' of github.com:frontlinesms/frontlinesms2 into CORE-1104-fix