fix tests for 5.18
Merge pull request #46 from gfx/feature/fix-test-failure-on-5.18

fix tests for 5.18