add test
Refactering