Updating tests
Updating tests, still need to add functionality for tenants etc... domain C/D fail because of missing auth methods...