Increase tests coverage
Refactor