added nunit and more tests