fixed failing tests
fixed my failing tests
Merge pull request #508 from MGhanem/fixing_tests

Fixing tests