fixed unit tests and some namespacing issues