Fixed tests again and their namespaces.