Fix interceptor unit and int tests