test fixes
Merge pull request #2710 from sebv/test-fixes

Test fixes