rearranged some testing setup to get better coverage.

Testing in this area is still quite weak.