Fixed test
Refactoring update