Refine tests and add tests for more full coverage

[jonkeane]

This is partially in preparation for moving to datalogistik — but these tests should have been this way all along.