1) Added Factory Unit Tests
2) Updated Namespaces