tests rewritten (using namespaces)