This PR was merged into the 2.2.x-dev branch.

Discussion
----------

Refactoring tests

I've refactored some tests, using:
- `assertCount` instead of `count` function;
- `assertFalse` instead of strict comparison with `false` keyword;
- `assertArrayHasKey` instead of `isset` function.

Commits
-------

b163e443 Refactoring tests