fixed all tests
Merge pull request #510 from MGhanem/fixing_jasmine_tests

fixed all tests