Remove unnecessary code

We don't need to skip the filter, we can simply rely on the controller
action overridding the expiry time and max age when required. Also
added an additional test to verify max age overrides scheduled edition
times.