changes from nunit2