mostly some more tests

Prior version was mitsuhiko's with warner's patch.