Fix nunit tests