Fix failing unit test.
Remove debug code