Fix interceptor unit and int tests
Merge pull request #367 from shenrie/master

Fix interceptor unit and int tests