Fix interceptor & tests