Nunit improvements.