Fixed test exceptions for most of tests
Merge branch 'fix_master' of github.com:MGhanem/smartsoft-13 into fix_master