Adjust namespaces and test organization.