Added lots of debug statements in general, specifically for test2