Add tests.

Signed-off-by: Matt Benjamin <matt@linuxbox.com>
Spacing cleanups.

Signed-off-by: Matt Benjamin <matt@linuxbox.com>