Unit tests fixes

Unit tests passed on CentOS 6.5 with this fixes
Merge pull request #249 from DSRCompany/develop_fix_unit_tests

Unit tests fixes
TRQ-2690: add a warning saying -s and -o should not be used together; else, only the output of the mother superior is shown.
TRQ-2690: Fixed punctuation to prior checkin.