Added tests, starting to namespacing everything