diff --git a/NUSDTEST/AuthoringTests.txt b/NUSDTEST/AuthoringTests.txt
deleted file mode 100644
index 64bab94..0000000
--- a/NUSDTEST/AuthoringTests.txt
+++ /dev/null
@@ -1,136 +0,0 @@
-==========================================================================
-    Visual Studio Team System: Overview of Authoring and Running Tests    
-==========================================================================
-
-This overview describes the features for authoring and running tests in 
-Visual Studio Team System and Visual Studio Team Edition for Software Testers.
-
-Opening Tests
--------------
-To open a test, open a test project or a test metadata file (a file with
-extension .vsmdi) that contains the definition of the test. You can find
-test projects and metadata files in Solution Explorer.
-
-Viewing Tests
--------------
-To see which tests are available to you, open the Test View window. Or,
-if you have installed Team Edition for Software Testers, you can also open
-the Test List Editor window to view tests.
-
-To open the Test View window, click the Test menu, point to Windows, and
-then click Test View. To open the Test List Editor window (if you have
-installed Team Edition for Software Testers), click Test, point to Windows,
-and then click Test List Editor.
-
-Running Tests
--------------
-You can run tests from the Test View window and the Test List Editor window.
-See Viewing Tests to learn how to open these windows. To run one or more
-tests displayed in the Test View window, first select the tests in that
-window; to select multiple tests, hold either the Shift or CTRL key while
-clicking tests. Then click the Run Tests button in the Test View window
-toolbar.
-
-If you have installed Visual Studio Team Edition for Software Testers, you can
-also use the Test List Editor window to run tests. To run tests in Test List Editor,
-select the check box next to each test that you want to run. Then click the
-Run Tests button in the Test List Editor window toolbar.
-
-Viewing Test Results
---------------------
-When you run a test or a series of tests, the results of the test run will be
-shown in the Test Results window. Each individual test in the run is shown on
-a separate line so that you can see its status. The window contains an
-embedded status bar in the top half of the window that provides you with
-summary details of the complete test run.
-
-To see more detailed results for a particular test result, double-click it in
-the Test Results window. This opens a window that provides more information
-about the particular test result, such as any specific error messages returned
-by the test.
-
-Changing the way that tests are run
------------------------------------
-Each time you run one or more tests, a collection of settings is used to
-determine how those tests are run. These settings are contained in a “test
-run configuration” file.
-
-Here is a partial list of the changes you can make with a test run 
-configuration file:
-
- - Change the naming scheme for each test run.
- - Change the test controller that the tests are run on so that you can run
-   tests remotely.
- - Gather code coverage data for the code being tested so that you can see
-   which lines of code are covered by your tests.
- - Enable and disable test deployment. 
- - Specify additional files to deploy before tests are run.
- - Select a different host, ASP.NET, for running ASP.NET unit tests.
- - Select a different host, the smart device test host, for running smart device unit tests.
- - Set various properties for the test agents that run your tests.
- - Run custom scripts at the start and end of each test run so that you can
-   set up the test environment exactly as required each time tests are run.
- - Set time limits for tests and test runs.
- - Set the browser mix and the number of times to repeat Web tests in the
-   test run.
-
-By default, a test run configuration file is created whenever you create a
-new test project. You make changes to this file by double-clicking it in 
-Solution Explorer and then changing its settings. (Test run configuration
-files have the extension .testrunconfig.)
-
-A solution can contain multiple test run configuration files. Only one of
-those files, known as the “Active” test run configuration file, is used to
-determine the settings that are currently used for test runs. You select
-the active test run configuration by clicking Select Active Test Run 
-Configuration on the Test menu.
-
--------------------------------------------------------------------------------
-
-Test Types
-----------
-Using Visual Studio Team Edition for Software Testers, you can create a number
-of different test types:
-
-Unit test: Use a unit test to create a programmatic test in C++, Visual C# or
-Visual Basic that exercises source code. A unit test calls the methods of a
-class, passing suitable parameters, and verifies that the returned value is
-what you expect.
-There are three specialized variants of unit tests:
- - Data-driven unit tests are created when you configure a unit test to be
-   called repeatedly for each row of a data source. The data from each row
-   is used by the unit test as input data.
- - ASP.NET unit tests are unit tests that exercise code in an ASP.NET Web
-   application.
- - Smart device unit tests are unit tests that are deployed to a smart device
-   or emulator and then executed by the smart device test host.  
-
-Web Test: Web tests consist of an ordered series of HTTP requests that you
-record in a browser session using Microsoft Internet Explorer. You can have
-the test report specific details about the pages or sites it requests, such
-as whether a particular page contains a specified string.
-
-Load Test: You use a load test to encapsulate non-manual tests, such as
-unit, Web, and generic tests, and then run them simultaneously by using
-virtual users. Running these tests under load generates test results,
-including performance and other counters, in tables and in graphs.
-
-Generic test: A generic test is an existing program wrapped to function as a
-test in Visual Studio. The following are examples of tests or programs that
-you can turn into generic tests:
- - An existing test that uses process exit codes to communicate whether the
-   test passed or failed. 0 indicates passing and any other value indicates
-   a failure.
- - A general program to obtain specific functionality during a test scenario.
- - A test or program that uses a special XML file (called a “summary results
-   file”), to communicate detailed results.
-
-Manual test: The manual test type is used when the test tasks are to be
-completed by a test engineer as opposed to an automated script.
-
-Ordered test: Use an ordered test to execute a set of tests in an order you
-specify.
-
--------------------------------------------------------------------------------
-
-
diff --git a/NUSDTEST/Form1Test.cs b/NUSDTEST/Form1Test.cs
deleted file mode 100644
index 2b295d7..0000000
--- a/NUSDTEST/Form1Test.cs
+++ /dev/null
@@ -1,1055 +0,0 @@
-using NUS_Downloader;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Windows.Forms;
-using System.Xml;
-using System;
-using System.ComponentModel;
-using System.IO;
-using System.Drawing;
-
-namespace NUSDTEST
-{
-    
-    
-    /// <summary>
-    ///This is a test class for Form1Test and is intended
-    ///to contain all Form1Test Unit Tests
-    ///</summary>
-    [TestClass()]
-    public class Form1Test
-    {
-
-
-        private TestContext testContextInstance;
-
-        /// <summary>
-        ///Gets or sets the test context which provides
-        ///information about and functionality for the current test run.
-        ///</summary>
-        public TestContext TestContext
-        {
-            get
-            {
-                return testContextInstance;
-            }
-            set
-            {
-                testContextInstance = value;
-            }
-        }
-
-        #region Additional test attributes
-        // 
-        //You can use the following additional attributes as you write your tests:
-        //
-        //Use ClassInitialize to run code before running the first test in the class
-        //[ClassInitialize()]
-        //public static void MyClassInitialize(TestContext testContext)
-        //{
-        //}
-        //
-        //Use ClassCleanup to run code after all tests in a class have run
-        //[ClassCleanup()]
-        //public static void MyClassCleanup()
-        //{
-        //}
-        //
-        //Use TestInitialize to run code before running each test
-        //[TestInitialize()]
-        //public void MyTestInitialize()
-        //{
-        //}
-        //
-        //Use TestCleanup to run code after each test has run
-        //[TestCleanup()]
-        //public void MyTestCleanup()
-        //{
-        //}
-        //
-        #endregion
-
-
-        /// <summary>
-        ///A test for ZeroSignature
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void ZeroSignatureTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            byte[] tmdortik = null; // TODO: Initialize to an appropriate value
-            byte[] expected = null; // TODO: Initialize to an appropriate value
-            byte[] actual;
-            actual = target.ZeroSignature(tmdortik);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for wwitem_regionclicked
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void wwitem_regionclickedTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            object sender = null; // TODO: Initialize to an appropriate value
-            ToolStripItemClickedEventArgs e = null; // TODO: Initialize to an appropriate value
-            target.wwitem_regionclicked(sender, e);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for WriteStatus
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void WriteStatusTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            string Update = string.Empty; // TODO: Initialize to an appropriate value
-            target.WriteStatus(Update);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for verifyMd5Hash
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void verifyMd5HashTest()
-        {
-            string input = string.Empty; // TODO: Initialize to an appropriate value
-            string hash = string.Empty; // TODO: Initialize to an appropriate value
-            bool expected = false; // TODO: Initialize to an appropriate value
-            bool actual;
-            actual = Form1_Accessor.verifyMd5Hash(input, hash);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for UpdatePackedName
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void UpdatePackedNameTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            target.UpdatePackedName();
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for TruchaSign
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void TruchaSignTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            byte[] tmdortik = null; // TODO: Initialize to an appropriate value
-            byte[] expected = null; // TODO: Initialize to an appropriate value
-            byte[] actual;
-            actual = target.TruchaSign(tmdortik);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for TrimLeadingZeros
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void TrimLeadingZerosTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            string num = string.Empty; // TODO: Initialize to an appropriate value
-            string expected = string.Empty; // TODO: Initialize to an appropriate value
-            string actual;
-            actual = target.TrimLeadingZeros(num);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for titleversion_TextChanged
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void titleversion_TextChangedTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            object sender = null; // TODO: Initialize to an appropriate value
-            EventArgs e = null; // TODO: Initialize to an appropriate value
-            target.titleversion_TextChanged(sender, e);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for titleidbox_TextChanged
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void titleidbox_TextChangedTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            object sender = null; // TODO: Initialize to an appropriate value
-            EventArgs e = null; // TODO: Initialize to an appropriate value
-            target.titleidbox_TextChanged(sender, e);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for sysitem_versionclicked
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void sysitem_versionclickedTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            object sender = null; // TODO: Initialize to an appropriate value
-            ToolStripItemClickedEventArgs e = null; // TODO: Initialize to an appropriate value
-            target.sysitem_versionclicked(sender, e);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for StrToByteArray
-        ///</summary>
-        [TestMethod()]
-        public void StrToByteArrayTest()
-        {
-            string str = string.Empty; // TODO: Initialize to an appropriate value
-            byte[] expected = null; // TODO: Initialize to an appropriate value
-            byte[] actual;
-            actual = Form1.StrToByteArray(str);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for ShowInnerToolTips
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void ShowInnerToolTipsTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            bool enabled = false; // TODO: Initialize to an appropriate value
-            target.ShowInnerToolTips(enabled);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for SetEnableforDownload
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void SetEnableforDownloadTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            bool enabled = false; // TODO: Initialize to an appropriate value
-            target.SetEnableforDownload(enabled);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for SelectItemImage
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void SelectItemImageTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            bool ticket = false; // TODO: Initialize to an appropriate value
-            bool danger = false; // TODO: Initialize to an appropriate value
-            Image expected = null; // TODO: Initialize to an appropriate value
-            Image actual;
-            actual = target.SelectItemImage(ticket, danger);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for RemoveIllegalCharacters
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void RemoveIllegalCharactersTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            string databasestr = string.Empty; // TODO: Initialize to an appropriate value
-            string expected = string.Empty; // TODO: Initialize to an appropriate value
-            string actual;
-            actual = target.RemoveIllegalCharacters(databasestr);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for RegionFromIndex
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void RegionFromIndexTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            int index = 0; // TODO: Initialize to an appropriate value
-            XmlDocument databasexml = null; // TODO: Initialize to an appropriate value
-            string expected = string.Empty; // TODO: Initialize to an appropriate value
-            string actual;
-            actual = target.RegionFromIndex(index, databasexml);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for RegionCodesList_DropDownItemClicked
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void RegionCodesList_DropDownItemClickedTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            object sender = null; // TODO: Initialize to an appropriate value
-            ToolStripItemClickedEventArgs e = null; // TODO: Initialize to an appropriate value
-            target.RegionCodesList_DropDownItemClicked(sender, e);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for ReadIDType
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void ReadIDTypeTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            string ttlid = string.Empty; // TODO: Initialize to an appropriate value
-            target.ReadIDType(ttlid);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for ReadFully
-        ///</summary>
-        [TestMethod()]
-        public void ReadFullyTest1()
-        {
-            Stream stream = null; // TODO: Initialize to an appropriate value
-            int initialLength = 0; // TODO: Initialize to an appropriate value
-            byte[] expected = null; // TODO: Initialize to an appropriate value
-            byte[] actual;
-            actual = Form1.ReadFully(stream, initialLength);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for ReadFully
-        ///</summary>
-        [TestMethod()]
-        public void ReadFullyTest()
-        {
-            Form1 target = new Form1(); // TODO: Initialize to an appropriate value
-            Stream stream = null; // TODO: Initialize to an appropriate value
-            byte[] expected = null; // TODO: Initialize to an appropriate value
-            byte[] actual;
-            actual = target.ReadFully(stream);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for radioButton2_CheckedChanged
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void radioButton2_CheckedChangedTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            object sender = null; // TODO: Initialize to an appropriate value
-            EventArgs e = null; // TODO: Initialize to an appropriate value
-            target.radioButton2_CheckedChanged(sender, e);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for radioButton1_CheckedChanged
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void radioButton1_CheckedChangedTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            object sender = null; // TODO: Initialize to an appropriate value
-            EventArgs e = null; // TODO: Initialize to an appropriate value
-            target.radioButton1_CheckedChanged(sender, e);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for PackWAD
-        ///</summary>
-        [TestMethod()]
-        public void PackWADTest()
-        {
-            Form1 target = new Form1(); // TODO: Initialize to an appropriate value
-            string titleid = string.Empty; // TODO: Initialize to an appropriate value
-            string tmdfilename = string.Empty; // TODO: Initialize to an appropriate value
-            int contentcount = 0; // TODO: Initialize to an appropriate value
-            string[] contentnames = null; // TODO: Initialize to an appropriate value
-            string[] contentsizes = null; // TODO: Initialize to an appropriate value
-            string totaldirectory = string.Empty; // TODO: Initialize to an appropriate value
-            target.PackWAD(titleid, tmdfilename, contentcount, contentnames, contentsizes, totaldirectory);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for packbox_CheckedChanged
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void packbox_CheckedChangedTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            object sender = null; // TODO: Initialize to an appropriate value
-            EventArgs e = null; // TODO: Initialize to an appropriate value
-            target.packbox_CheckedChanged(sender, e);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for NUSDownloader_DoWork
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void NUSDownloader_DoWorkTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            object sender = null; // TODO: Initialize to an appropriate value
-            DoWorkEventArgs e = null; // TODO: Initialize to an appropriate value
-            target.NUSDownloader_DoWork(sender, e);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for MakeProperLength
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void MakeProperLengthTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            string hex = string.Empty; // TODO: Initialize to an appropriate value
-            string expected = string.Empty; // TODO: Initialize to an appropriate value
-            string actual;
-            actual = target.MakeProperLength(hex);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for LoadRegionCodes
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void LoadRegionCodesTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            target.LoadRegionCodes();
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for LoadCommonKey
-        ///</summary>
-        [TestMethod()]
-        public void LoadCommonKeyTest()
-        {
-            Form1 target = new Form1(); // TODO: Initialize to an appropriate value
-            string keyfile = string.Empty; // TODO: Initialize to an appropriate value
-            byte[] expected = null; // TODO: Initialize to an appropriate value
-            byte[] actual;
-            actual = target.LoadCommonKey(keyfile);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for IOSNeededFromTMD
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void IOSNeededFromTMDTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            byte[] tmd = null; // TODO: Initialize to an appropriate value
-            string expected = string.Empty; // TODO: Initialize to an appropriate value
-            string actual;
-            actual = target.IOSNeededFromTMD(tmd);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for InttoByteArray
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void InttoByteArrayTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            int inte = 0; // TODO: Initialize to an appropriate value
-            int arraysize = 0; // TODO: Initialize to an appropriate value
-            byte[] expected = null; // TODO: Initialize to an appropriate value
-            byte[] actual;
-            actual = target.InttoByteArray(inte, arraysize);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for InitializeComponent
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void InitializeComponentTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            target.InitializeComponent();
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for initCrypt
-        ///</summary>
-        [TestMethod()]
-        public void initCryptTest()
-        {
-            Form1 target = new Form1(); // TODO: Initialize to an appropriate value
-            byte[] iv = null; // TODO: Initialize to an appropriate value
-            byte[] key = null; // TODO: Initialize to an appropriate value
-            target.initCrypt(iv, key);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for incrementAtIndex
-        ///</summary>
-        [TestMethod()]
-        public void incrementAtIndexTest()
-        {
-            byte[] array = null; // TODO: Initialize to an appropriate value
-            int index = 0; // TODO: Initialize to an appropriate value
-            byte[] expected = null; // TODO: Initialize to an appropriate value
-            byte[] actual;
-            actual = Form1.incrementAtIndex(array, index);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for HandleMismatch
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void HandleMismatchTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            int contentsize = 0; // TODO: Initialize to an appropriate value
-            int actualsize = 0; // TODO: Initialize to an appropriate value
-            target.HandleMismatch(contentsize, actualsize);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for getMd5Hash
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void getMd5HashTest()
-        {
-            string input = string.Empty; // TODO: Initialize to an appropriate value
-            string expected = string.Empty; // TODO: Initialize to an appropriate value
-            string actual;
-            actual = Form1_Accessor.getMd5Hash(input);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for GetContentSizes
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void GetContentSizesTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            byte[] tmdfile = null; // TODO: Initialize to an appropriate value
-            int length = 0; // TODO: Initialize to an appropriate value
-            string[] expected = null; // TODO: Initialize to an appropriate value
-            string[] actual;
-            actual = target.GetContentSizes(tmdfile, length);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for GetContentNames
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void GetContentNamesTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            byte[] tmdfile = null; // TODO: Initialize to an appropriate value
-            int length = 0; // TODO: Initialize to an appropriate value
-            string[] expected = null; // TODO: Initialize to an appropriate value
-            string[] actual;
-            actual = target.GetContentNames(tmdfile, length);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for GetContentIndices
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void GetContentIndicesTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            byte[] tmdfile = null; // TODO: Initialize to an appropriate value
-            int length = 0; // TODO: Initialize to an appropriate value
-            byte[] expected = null; // TODO: Initialize to an appropriate value
-            byte[] actual;
-            actual = target.GetContentIndices(tmdfile, length);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for GetContentHashes
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void GetContentHashesTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            byte[] tmdfile = null; // TODO: Initialize to an appropriate value
-            int length = 0; // TODO: Initialize to an appropriate value
-            byte[] expected = null; // TODO: Initialize to an appropriate value
-            byte[] actual;
-            actual = target.GetContentHashes(tmdfile, length);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for getcerts_Click
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void getcerts_ClickTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            object sender = null; // TODO: Initialize to an appropriate value
-            EventArgs e = null; // TODO: Initialize to an appropriate value
-            target.getcerts_Click(sender, e);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for Form1_Load
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void Form1_LoadTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            object sender = null; // TODO: Initialize to an appropriate value
-            EventArgs e = null; // TODO: Initialize to an appropriate value
-            target.Form1_Load(sender, e);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for FillDatabaseStrip
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void FillDatabaseStripTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            target.FillDatabaseStrip();
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for FileLocationToByteArray
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void FileLocationToByteArrayTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            string filename = string.Empty; // TODO: Initialize to an appropriate value
-            byte[] expected = null; // TODO: Initialize to an appropriate value
-            byte[] actual;
-            actual = target.FileLocationToByteArray(filename);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for Encrypt
-        ///</summary>
-        [TestMethod()]
-        public void EncryptTest()
-        {
-            Form1 target = new Form1(); // TODO: Initialize to an appropriate value
-            byte[] plainBytes = null; // TODO: Initialize to an appropriate value
-            byte[] expected = null; // TODO: Initialize to an appropriate value
-            byte[] actual;
-            actual = target.Encrypt(plainBytes);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for DownloadNUSFile
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void DownloadNUSFileTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            string titleid = string.Empty; // TODO: Initialize to an appropriate value
-            string filename = string.Empty; // TODO: Initialize to an appropriate value
-            string placementdir = string.Empty; // TODO: Initialize to an appropriate value
-            int sizeinbytes = 0; // TODO: Initialize to an appropriate value
-            bool iswiititle = false; // TODO: Initialize to an appropriate value
-            target.DownloadNUSFile(titleid, filename, placementdir, sizeinbytes, iswiititle);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for Dispose
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void DisposeTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            bool disposing = false; // TODO: Initialize to an appropriate value
-            target.Dispose(disposing);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for DisplayBytes
-        ///</summary>
-        [TestMethod()]
-        public void DisplayBytesTest()
-        {
-            Form1 target = new Form1(); // TODO: Initialize to an appropriate value
-            byte[] bytes = null; // TODO: Initialize to an appropriate value
-            string spacer = string.Empty; // TODO: Initialize to an appropriate value
-            string expected = string.Empty; // TODO: Initialize to an appropriate value
-            string actual;
-            actual = target.DisplayBytes(bytes, spacer);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for DeleteTitleDirectory
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void DeleteTitleDirectoryTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            target.DeleteTitleDirectory();
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for Decrypt
-        ///</summary>
-        [TestMethod()]
-        public void DecryptTest()
-        {
-            Form1 target = new Form1(); // TODO: Initialize to an appropriate value
-            byte[] encryptedData = null; // TODO: Initialize to an appropriate value
-            byte[] expected = null; // TODO: Initialize to an appropriate value
-            byte[] actual;
-            actual = target.Decrypt(encryptedData);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for CreateTitleDirectory
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void CreateTitleDirectoryTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            target.CreateTitleDirectory();
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for ConvertToHex
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void ConvertToHexTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            string decval = string.Empty; // TODO: Initialize to an appropriate value
-            string expected = string.Empty; // TODO: Initialize to an appropriate value
-            string actual;
-            actual = target.ConvertToHex(decval);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for ComputeSHA
-        ///</summary>
-        [TestMethod()]
-        public void ComputeSHATest()
-        {
-            byte[] data = null; // TODO: Initialize to an appropriate value
-            byte[] expected = null; // TODO: Initialize to an appropriate value
-            byte[] actual;
-            actual = Form1.ComputeSHA(data);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for ClearDatabaseStrip
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void ClearDatabaseStripTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            target.ClearDatabaseStrip();
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for ByteBoundary
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void ByteBoundaryTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            int currentlength = 0; // TODO: Initialize to an appropriate value
-            long expected = 0; // TODO: Initialize to an appropriate value
-            long actual;
-            actual = target.ByteBoundary(currentlength);
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for button7_Click
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void button7_ClickTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            object sender = null; // TODO: Initialize to an appropriate value
-            EventArgs e = null; // TODO: Initialize to an appropriate value
-            target.button7_Click(sender, e);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for button6_Click
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void button6_ClickTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            object sender = null; // TODO: Initialize to an appropriate value
-            EventArgs e = null; // TODO: Initialize to an appropriate value
-            target.button6_Click(sender, e);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for button5_Click
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void button5_ClickTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            object sender = null; // TODO: Initialize to an appropriate value
-            EventArgs e = null; // TODO: Initialize to an appropriate value
-            target.button5_Click(sender, e);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for button4_Click_1
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void button4_Click_1Test()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            object sender = null; // TODO: Initialize to an appropriate value
-            EventArgs e = null; // TODO: Initialize to an appropriate value
-            target.button4_Click_1(sender, e);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for button4_Click
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void button4_ClickTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            object sender = null; // TODO: Initialize to an appropriate value
-            EventArgs e = null; // TODO: Initialize to an appropriate value
-            target.button4_Click(sender, e);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for button3_Click_1
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void button3_Click_1Test()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            object sender = null; // TODO: Initialize to an appropriate value
-            EventArgs e = null; // TODO: Initialize to an appropriate value
-            target.button3_Click_1(sender, e);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for button3_Click
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void button3_ClickTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            object sender = null; // TODO: Initialize to an appropriate value
-            EventArgs e = null; // TODO: Initialize to an appropriate value
-            target.button3_Click(sender, e);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for button2_Click
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void button2_ClickTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            object sender = null; // TODO: Initialize to an appropriate value
-            EventArgs e = null; // TODO: Initialize to an appropriate value
-            target.button2_Click(sender, e);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for button1_Click_1
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void button1_Click_1Test()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            object sender = null; // TODO: Initialize to an appropriate value
-            EventArgs e = null; // TODO: Initialize to an appropriate value
-            target.button1_Click_1(sender, e);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for button1_Click
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void button1_ClickTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            object sender = null; // TODO: Initialize to an appropriate value
-            EventArgs e = null; // TODO: Initialize to an appropriate value
-            target.button1_Click(sender, e);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for BootChecks
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void BootChecksTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            bool expected = false; // TODO: Initialize to an appropriate value
-            bool actual;
-            actual = target.BootChecks();
-            Assert.AreEqual(expected, actual);
-            Assert.Inconclusive("Verify the correctness of this test method.");
-        }
-
-        /// <summary>
-        ///A test for AddToolStripItemToStrip
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void AddToolStripItemToStripTest()
-        {
-            Form1_Accessor target = new Form1_Accessor(); // TODO: Initialize to an appropriate value
-            int type = 0; // TODO: Initialize to an appropriate value
-            ToolStripMenuItem additionitem = null; // TODO: Initialize to an appropriate value
-            XmlAttributeCollection attributes = null; // TODO: Initialize to an appropriate value
-            target.AddToolStripItemToStrip(type, additionitem, attributes);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-
-        /// <summary>
-        ///A test for Form1 Constructor
-        ///</summary>
-        [TestMethod()]
-        public void Form1ConstructorTest1()
-        {
-            Form1 target = new Form1();
-            Assert.Inconclusive("TODO: Implement code to verify target");
-        }
-
-        /// <summary>
-        ///A test for Form1 Constructor
-        ///</summary>
-        [TestMethod()]
-        public void Form1ConstructorTest()
-        {
-            string[] args = null; // TODO: Initialize to an appropriate value
-            Form1 target = new Form1(args);
-            Assert.Inconclusive("TODO: Implement code to verify target");
-        }
-    }
-}
diff --git a/NUSDTEST/NUSDTEST.csproj b/NUSDTEST/NUSDTEST.csproj
deleted file mode 100644
index c3d9790..0000000
--- a/NUSDTEST/NUSDTEST.csproj
+++ /dev/null
@@ -1,72 +0,0 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{BC13EE75-CAC3-4CB4-A67F-C8B3CCDFD63B}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NUSDTEST</RootNamespace>
-    <AssemblyName>NUSDTEST</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Form1Test.cs" />
-    <Compile Include="ProgramTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ResourcesTest.cs" />
-    <Compile Include="SettingsTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="AuthoringTests.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\NUS Downloader\NUS Downloader.csproj">
-      <Project>{DB1289FA-BA83-408F-A576-326E5EC4CC6D}</Project>
-      <Name>NUS Downloader</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Shadow Include="Test References\NUS Downloader.accessor" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/NUSDTEST/ProgramTest.cs b/NUSDTEST/ProgramTest.cs
deleted file mode 100644
index 73f069e..0000000
--- a/NUSDTEST/ProgramTest.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using NUS_Downloader;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-namespace NUSDTEST
-{
-    
-    
-    /// <summary>
-    ///This is a test class for ProgramTest and is intended
-    ///to contain all ProgramTest Unit Tests
-    ///</summary>
-    [TestClass()]
-    public class ProgramTest
-    {
-
-
-        private TestContext testContextInstance;
-
-        /// <summary>
-        ///Gets or sets the test context which provides
-        ///information about and functionality for the current test run.
-        ///</summary>
-        public TestContext TestContext
-        {
-            get
-            {
-                return testContextInstance;
-            }
-            set
-            {
-                testContextInstance = value;
-            }
-        }
-
-        #region Additional test attributes
-        // 
-        //You can use the following additional attributes as you write your tests:
-        //
-        //Use ClassInitialize to run code before running the first test in the class
-        //[ClassInitialize()]
-        //public static void MyClassInitialize(TestContext testContext)
-        //{
-        //}
-        //
-        //Use ClassCleanup to run code after all tests in a class have run
-        //[ClassCleanup()]
-        //public static void MyClassCleanup()
-        //{
-        //}
-        //
-        //Use TestInitialize to run code before running each test
-        //[TestInitialize()]
-        //public void MyTestInitialize()
-        //{
-        //}
-        //
-        //Use TestCleanup to run code after each test has run
-        //[TestCleanup()]
-        //public void MyTestCleanup()
-        //{
-        //}
-        //
-        #endregion
-
-
-        /// <summary>
-        ///A test for Main
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void MainTest()
-        {
-            string[] args = null; // TODO: Initialize to an appropriate value
-            Program_Accessor.Main(args);
-            Assert.Inconclusive("A method that does not return a value cannot be verified.");
-        }
-    }
-}
diff --git a/NUSDTEST/Properties/AssemblyInfo.cs b/NUSDTEST/Properties/AssemblyInfo.cs
deleted file mode 100644
index ed8827a..0000000
--- a/NUSDTEST/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("NUSDTEST")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("NUSDTEST")]
-[assembly: AssemblyCopyright("Copyright ©  2009")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM componenets.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("21ad20c3-5bda-47ed-875a-bd7274986e95")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/NUSDTEST/ResourcesTest.cs b/NUSDTEST/ResourcesTest.cs
deleted file mode 100644
index 311e265..0000000
--- a/NUSDTEST/ResourcesTest.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-using NUS_Downloader.Properties;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-namespace NUSDTEST
-{
-    
-    
-    /// <summary>
-    ///This is a test class for ResourcesTest and is intended
-    ///to contain all ResourcesTest Unit Tests
-    ///</summary>
-    [TestClass()]
-    public class ResourcesTest
-    {
-
-
-        private TestContext testContextInstance;
-
-        /// <summary>
-        ///Gets or sets the test context which provides
-        ///information about and functionality for the current test run.
-        ///</summary>
-        public TestContext TestContext
-        {
-            get
-            {
-                return testContextInstance;
-            }
-            set
-            {
-                testContextInstance = value;
-            }
-        }
-
-        #region Additional test attributes
-        // 
-        //You can use the following additional attributes as you write your tests:
-        //
-        //Use ClassInitialize to run code before running the first test in the class
-        //[ClassInitialize()]
-        //public static void MyClassInitialize(TestContext testContext)
-        //{
-        //}
-        //
-        //Use ClassCleanup to run code after all tests in a class have run
-        //[ClassCleanup()]
-        //public static void MyClassCleanup()
-        //{
-        //}
-        //
-        //Use TestInitialize to run code before running each test
-        //[TestInitialize()]
-        //public void MyTestInitialize()
-        //{
-        //}
-        //
-        //Use TestCleanup to run code after each test has run
-        //[TestCleanup()]
-        //public void MyTestCleanup()
-        //{
-        //}
-        //
-        #endregion
-
-
-        /// <summary>
-        ///A test for wilolgoi
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void wilolgoiTest()
-        {
-            // Private Accessor for NUS_Downloader.Properties.Resources is not found. Please rebuild the containing project or run the Publicize.exe manually.
-            Assert.Inconclusive("Private Accessor for NUS_Downloader.Properties.Resources is not found. Please reb" +
-                    "uild the containing project or run the Publicize.exe manually.");
-        }
-
-        /// <summary>
-        ///A test for ResourceManager
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void ResourceManagerTest()
-        {
-            // Private Accessor for NUS_Downloader.Properties.Resources is not found. Please rebuild the containing project or run the Publicize.exe manually.
-            Assert.Inconclusive("Private Accessor for NUS_Downloader.Properties.Resources is not found. Please reb" +
-                    "uild the containing project or run the Publicize.exe manually.");
-        }
-
-        /// <summary>
-        ///A test for dsi
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void dsiTest()
-        {
-            // Private Accessor for NUS_Downloader.Properties.Resources is not found. Please rebuild the containing project or run the Publicize.exe manually.
-            Assert.Inconclusive("Private Accessor for NUS_Downloader.Properties.Resources is not found. Please reb" +
-                    "uild the containing project or run the Publicize.exe manually.");
-        }
-
-        /// <summary>
-        ///A test for Culture
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void CultureTest()
-        {
-            // Private Accessor for NUS_Downloader.Properties.Resources is not found. Please rebuild the containing project or run the Publicize.exe manually.
-            Assert.Inconclusive("Private Accessor for NUS_Downloader.Properties.Resources is not found. Please reb" +
-                    "uild the containing project or run the Publicize.exe manually.");
-        }
-
-        /// <summary>
-        ///A test for bullet_redorange
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void bullet_redorangeTest()
-        {
-            // Private Accessor for NUS_Downloader.Properties.Resources is not found. Please rebuild the containing project or run the Publicize.exe manually.
-            Assert.Inconclusive("Private Accessor for NUS_Downloader.Properties.Resources is not found. Please reb" +
-                    "uild the containing project or run the Publicize.exe manually.");
-        }
-
-        /// <summary>
-        ///A test for bullet_redgreen
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void bullet_redgreenTest()
-        {
-            // Private Accessor for NUS_Downloader.Properties.Resources is not found. Please rebuild the containing project or run the Publicize.exe manually.
-            Assert.Inconclusive("Private Accessor for NUS_Downloader.Properties.Resources is not found. Please reb" +
-                    "uild the containing project or run the Publicize.exe manually.");
-        }
-
-        /// <summary>
-        ///A test for bullet_red
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void bullet_redTest()
-        {
-            // Private Accessor for NUS_Downloader.Properties.Resources is not found. Please rebuild the containing project or run the Publicize.exe manually.
-            Assert.Inconclusive("Private Accessor for NUS_Downloader.Properties.Resources is not found. Please reb" +
-                    "uild the containing project or run the Publicize.exe manually.");
-        }
-
-        /// <summary>
-        ///A test for bullet_orange
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void bullet_orangeTest()
-        {
-            // Private Accessor for NUS_Downloader.Properties.Resources is not found. Please rebuild the containing project or run the Publicize.exe manually.
-            Assert.Inconclusive("Private Accessor for NUS_Downloader.Properties.Resources is not found. Please reb" +
-                    "uild the containing project or run the Publicize.exe manually.");
-        }
-
-        /// <summary>
-        ///A test for bullet_green
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void bullet_greenTest()
-        {
-            // Private Accessor for NUS_Downloader.Properties.Resources is not found. Please rebuild the containing project or run the Publicize.exe manually.
-            Assert.Inconclusive("Private Accessor for NUS_Downloader.Properties.Resources is not found. Please reb" +
-                    "uild the containing project or run the Publicize.exe manually.");
-        }
-
-        /// <summary>
-        ///A test for Resources Constructor
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void ResourcesConstructorTest()
-        {
-            // Private Accessor for NUS_Downloader.Properties.Resources is not found. Please rebuild the containing project or run the Publicize.exe manually.
-            Assert.Inconclusive("Private Accessor for NUS_Downloader.Properties.Resources is not found. Please reb" +
-                    "uild the containing project or run the Publicize.exe manually.");
-        }
-    }
-}
diff --git a/NUSDTEST/SettingsTest.cs b/NUSDTEST/SettingsTest.cs
deleted file mode 100644
index 729808e..0000000
--- a/NUSDTEST/SettingsTest.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using NUS_Downloader.Properties;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-namespace NUSDTEST
-{
-    
-    
-    /// <summary>
-    ///This is a test class for SettingsTest and is intended
-    ///to contain all SettingsTest Unit Tests
-    ///</summary>
-    [TestClass()]
-    public class SettingsTest
-    {
-
-
-        private TestContext testContextInstance;
-
-        /// <summary>
-        ///Gets or sets the test context which provides
-        ///information about and functionality for the current test run.
-        ///</summary>
-        public TestContext TestContext
-        {
-            get
-            {
-                return testContextInstance;
-            }
-            set
-            {
-                testContextInstance = value;
-            }
-        }
-
-        #region Additional test attributes
-        // 
-        //You can use the following additional attributes as you write your tests:
-        //
-        //Use ClassInitialize to run code before running the first test in the class
-        //[ClassInitialize()]
-        //public static void MyClassInitialize(TestContext testContext)
-        //{
-        //}
-        //
-        //Use ClassCleanup to run code after all tests in a class have run
-        //[ClassCleanup()]
-        //public static void MyClassCleanup()
-        //{
-        //}
-        //
-        //Use TestInitialize to run code before running each test
-        //[TestInitialize()]
-        //public void MyTestInitialize()
-        //{
-        //}
-        //
-        //Use TestCleanup to run code after each test has run
-        //[TestCleanup()]
-        //public void MyTestCleanup()
-        //{
-        //}
-        //
-        #endregion
-
-
-        /// <summary>
-        ///A test for Default
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void DefaultTest()
-        {
-            // Private Accessor for NUS_Downloader.Properties.Settings is not found. Please rebuild the containing project or run the Publicize.exe manually.
-            Assert.Inconclusive("Private Accessor for NUS_Downloader.Properties.Settings is not found. Please rebu" +
-                    "ild the containing project or run the Publicize.exe manually.");
-        }
-
-        /// <summary>
-        ///A test for Settings Constructor
-        ///</summary>
-        [TestMethod()]
-        [DeploymentItem("NUS Downloader.exe")]
-        public void SettingsConstructorTest()
-        {
-            // Private Accessor for NUS_Downloader.Properties.Settings is not found. Please rebuild the containing project or run the Publicize.exe manually.
-            Assert.Inconclusive("Private Accessor for NUS_Downloader.Properties.Settings is not found. Please rebu" +
-                    "ild the containing project or run the Publicize.exe manually.");
-        }
-    }
-}
diff --git a/NUSDTEST/Test References/NUS Downloader.accessor b/NUSDTEST/Test References/NUS Downloader.accessor
deleted file mode 100644
index 62749df..0000000
--- a/NUSDTEST/Test References/NUS Downloader.accessor	
+++ /dev/null
@@ -1,2 +0,0 @@
-NUS Downloader.exe
-Desktop