Refining some tests for speed, DiskQueue updates