Merge "Adds basic tests for disk config extension"