Fixed namespaces and updated test