Fixed some nunit-tests