Refactoring regarding the handling of rspecs with leases.
Tests with rspecs and leases