Upgrade PHPUnit
Some changes in unit tests
Minor fixes and improvements
fix setQuery for guzzle 5
Merge branch 'neeckeloo-feature/some-refactoring'