Fix bugs in disk tests

Wasn't paying attention last night and broke the build. @frodenas mind taking a look?