Changed how to manage namespaces in Droid, updated tests