Fix two failing tests.
Remove debug statements