refactoring
test fixed