further cleanup, response interceptor integration, added tests