Added whitelist interceptor selector + tests