Test fixes
Merge pull request #1349 from xispa/hotfix/next

Test fixes