Test coverage improvements. Over 90% of branches are now executed in

both directions. (CVS 3820)

FossilOrigin-Name: a776d93ccae3bfa6e992cdd1387571dd21561f98