Cleaned up unit tests and the interceptor