Fix test, simpler and better. svn:NO TEST
Fix test, simpler and better.
svn:NO TEST


git-svn-id: b7def5e201329fdc6881ed493a1f7b725c4b51fb@3331 a26ef69c-88ff-0310-839f-98b793d9c207

NLnetLabs/NSD,NLnetLabs/NSD,NLnetLabs/NSD,NLnetLabs/NSD