Merge "Started consolidation of disk config tests"