a few more nunit test modernization.