Lack of tests results in embarassing commits.

This is no longer a spike, so proper tests and rewrite are expected
soon.