Corrected Namespaces, Modified ReferenceAssembly, Added Unittests