Merge pull request #388 from angathorion/test-fix
Fixed failing tests.

(main@117b9289f2393d1cac73b10c464d853966934b9a)