More cases for disk options:

copy_on_read; dir type disk; file name with comma; discard.
remove the geometry option test as it fails to pass under some conditions.