Updated comments blocks
Updated phpunit configuration
Merge pull request #198 from AntonShevchuk/master

Updated phpunit configuration