refactoring
refactoring - integration tests
finished EDB logging integration test