Some work on tests.

trying to increase the coverage...