Fixing small issues
#6 Terminating Interceptors and finishing basic tests
#6 Terminating Interceptors and finishing basic tests