add more logging
adjust deps and add comments to tests
merge