Issue #3261486 by catch, longwave, dww: Remove core updates added prior to 9.3.0 and adjust test coverage