changed interceptor, adjusted tests