Adjusted unit tests, namespaces and dependencies.