Update tests
Refactoring