Merge pull request #21 from wagnert/master

Refactoring PHPUnit based integration test
minor changes in the comments
phpcs
Merge pull request #22 from wick-ed/master

minor comment changes