Improving tests

- Making them pass through Lint;
- Improving readability.