Fixing Advance Disk IO tests and general formatting