Fix for failing batch test
Merge pull request #942 from timlinux/test-fixes

Fix for failing batch test