Updated namespaces and other information in test files