refactoring - integration tests
refactoring - integration tests