Moving namespaces and adding start of unit tests