added several namespaces and tests