fixed scrutinizer issues
Merge pull request #20 from zelgerj/master

fixed scrutinizer issues
migrated context functionality in tests
phpcs
Merge pull request #21 from wick-ed/master

migrated context functionality in tests