Refactoring, fix test