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