Added more logging to fix tests