Remove debug statement.
Fix failing test cases.