NUnit and CodeCoverage fixes. Pull request code released under MIT licence