Grand final fix with namespaces of interfaces with tests