modified logging dependencies
Sync tests and changes
changes and tests