Added nunit tests and higher cell values