refactoring tests layout
refactor