Improving tests

- Making them pass through Lint;
- Improving readability.
Merge pull request #67 from abravalheri/master

Improving tests