Fix tests
Merge pull request #105 from sotty/5.6.x

Fix tests