Remove debug statements.
Fix bug in tests.