Add logging to track down test problems