Fixed base tests to counteract the new super type and interceptor/event handler additions