Cleaning all non-disk tests to be disk agnostic.