Added Some integration Tests
Merge branch 'master' of github.com:hosamaly/makanak