Interceptor improvements
Added test