Adding combined and improved disk_test_both.sh.