fixed tests to cope w/ namespaces