Removed lots of debug prints, fixed test failure