refactoring
new test