Added all namespaces to headers and tests, moved/renamed a couple of tests.