MDL-39846 add logging TODOs
MDL-39846 add more magic and improve tests