Improves test
Refactoring