Fix failing test

Improve also logging during tests while at it