updating tests
Refactoring