Removing duplicated spec setup + refactoring

* Halfway point in refactoring tenancy_spec