[patch] remaining parts of the test diff tree

[Lars Gullik Bjønnes]

Of course this will not be applied as is, but this is where I am going
to pull pieces from first.

diff-3.diff.gz
Description: GNU Zip compressed data

-- 
        Lgb