Removed nunit and fixed test bug