test suite tweaks
Don't use random Lease ids - there is no point