Refactoring
tests