Get tests passing.
Remove debugging.