Merge pull request #2849 from icco/master

Fix bugs in disk tests