Another bug fix in unit test
Merge branch 'logg/fix-issue-42' into next