Fixed up test and added more debug info.