added additional tests and nunit runner