Add more tests and namespaces