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

5.6.x Fix tests