Update testing macro with access to geometry to get cell indices, correct place of...