Tests fix and composer.json improvements
Merge pull request #7 from egulias/master

Tests fix and composer.json improvements