sort out leon's nunit mess
Merge pull request #1 from danbadge/master

sort out leon's nunit mess