Refactor geom tests for minimal loading.