refactoring tests
refactoring