Fixed tool_main to handle running disk tests.