Moves the super() override to overriding the built-in and automatically enabling when test mode is enabled.