Remove debug messsages, simplify tests.

Closes #20.
Closes #19.