refs #65 #67 changes in interceptor for test env