Adding new test + few refactoring