Refactor extrapolation mode handling
MAINT: Adjusted test to reflect new behaviour.