Remove debug lines and fix tests.