Improvement of naming and tests
Improvement of description