Update geometries
Remove logical definitions of missing volumes.
Remove duplicate file.
Merge pull request #3234 from ianna/regression-test-update

Geometry -- Regression Test Update