Tweaked the leasing tests and fixed potential issue with thread not completing