Nunit tests added