Add test
Refactor