Tests Review and fix
Merge pull request #42 from emrecaglar/master

Tests Review and fix