Remove redundant tests
Optimize namespaces