[PATCHESv2] selftest improvements

[abartlet at samba.org]

Thanks for the feedback all, I've updated the patches, pushed them to
my selftest-improvements branch and attached them in reply to this
mail.

I've fixed the issue Michael Wood found (thanks!) and fixed the
whitespace.

Please review/merge

Thanks,

Andrew Bartlett