More tests

And a TODO about one class to test in particular.

Signed-off-by: Francis Galiegue <fgaliegue@gmail.com>