Refactor Interceptor to improve readability
Update and refactor specs