fixed if statement
Automocked instance interceptors

With conveninece method to add logging interceptor
refactor

Move types to files
Merged code