Added NUnit support
Unit tests added and coverage increased