Merge pull request #940 from timlinux/test-fixes

Test fixes
Fix for failing batch test