Added tests to create interceptor
Remove test code
Remove more test code