Writing TenantScope tests
Refactor observer into scope and test
Started on trait tests