EST-385: Added unit tests, discarded setTenancyDuration and rewritten getTenancyDuration