Comment out extra tests and add more debug statements