Cleaning up Tests and code

Removed some code files that had not tests.
Fixed var naming and namespaces