Updated unittests for the reorganized library files. Also added use statements for namespaces and added a few tests.